diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-10-05 20:09:34 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-10-10 00:23:01 +1100 |
| commit | 18f8c3d00a24e5d1d0c2c92f45625437fe3ef478 (patch) | |
| tree | c2d42c1ac705a5f0837e2034b1d63b1bcae1d38f /test/integration/mergeConflicts | |
| parent | 074fbf6f25484579bb948031947317dbed83e983 (diff) | |
add merge conflicts integration test
Diffstat (limited to 'test/integration/mergeConflicts')
| -rw-r--r-- | test/integration/mergeConflicts/recording.json | 1 | ||||
| -rw-r--r-- | test/integration/mergeConflicts/snapshot.txt | 249 |
2 files changed, 250 insertions, 0 deletions
diff --git a/test/integration/mergeConflicts/recording.json b/test/integration/mergeConflicts/recording.json new file mode 100644 index 000000000..1ee1b28e8 --- /dev/null +++ b/test/integration/mergeConflicts/recording.json @@ -0,0 +1 @@ +[{"Timestamp":16,"Event":{"Type":1,"Mod":0,"Key":0,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":0,"Bytes":null}},{"Timestamp":565,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":99,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"Yw=="}},{"Timestamp":1029,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":1509,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":97,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"YQ=="}},{"Timestamp":1573,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":115,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"cw=="}},{"Timestamp":1613,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":1868,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":2413,"Event":{"Type":0,"Mod":0,"Key":65514,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09D"}},{"Timestamp":2708,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":3357,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":77,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"TQ=="}},{"Timestamp":3757,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":4509,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":5045,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":5356,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":5677,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":6365,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":7029,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":113,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"cQ=="}}]
\ No newline at end of file diff --git a/test/integration/mergeConflicts/snapshot.txt b/test/integration/mergeConflicts/snapshot.txt new file mode 100644 index 000000000..3d1d1e31d --- /dev/null +++ b/test/integration/mergeConflicts/snapshot.txt @@ -0,0 +1,249 @@ +On branch other_branch +nothing to commit, working tree clean +cat: ./directory: Is a directory +new1 +original2 +original3 +Here is a story that has been told throuhg the ages +once upon a time there was a cat +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +... +once upon a time there was another cat +once upon a time there was a horse +once upon a time there was a horse +once upon a time there was a horse +Merge branch 'base_branch' into other_branch + +asd + + +diff --git a/file b/file +index 37ec558..51c0b8a 100644 +--- a/file ++++ b/file +@@ -1,3 +1,3 @@ +-original1 ++new2 + original2 + original3 +file changed + + +diff --git a/file b/file +index 37ec558..fa90625 100644 +--- a/file ++++ b/file +@@ -1,3 +1,3 @@ +-original1 ++new1 + original2 + original3 +file + + +diff --git a/file b/file +new file mode 100644 +index 0000000..37ec558 +--- /dev/null ++++ b/file +@@ -0,0 +1,3 @@ ++original1 ++original2 ++original3 +fourth commit on master + + +diff --git a/file5 b/file5 +new file mode 100644 +index 0000000..e3ae5c6 +--- /dev/null ++++ b/file5 +@@ -0,0 +1 @@ ++once upon a time there was a horse +third commit on master + + +diff --git a/file4 b/file4 +new file mode 100644 +index 0000000..e3ae5c6 +--- /dev/null ++++ b/file4 +@@ -0,0 +1 @@ ++once upon a time there was a horse +second commit on master + + +diff --git a/file3 b/file3 +new file mode 100644 +index 0000000..e3ae5c6 +--- /dev/null ++++ b/file3 +@@ -0,0 +1 @@ ++once upon a time there was a horse +first commit on master + + +diff --git a/directory/file b/directory/file +index a5bce3f..df6b0d2 100644 +--- a/directory/file ++++ b/directory/file +@@ -1 +1 @@ +-test1 ++test3 +diff --git a/directory/file2 b/directory/file2 +index a5bce3f..df6b0d2 100644 +--- a/directory/file2 ++++ b/directory/file2 +@@ -1 +1 @@ +-test1 ++test3 +diff --git a/file1 b/file1 +index 88c39cd..dcd3485 100644 +--- a/file1 ++++ b/file1 +@@ -1 +1,63 @@ + Here is a story that has been told throuhg the ages ++once upon a time there was a cat ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++... ++once upon a time there was another cat +first commit + + +diff --git a/directory/file b/directory/file +new file mode 100644 +index 0000000..a5bce3f +--- /dev/null ++++ b/directory/file +@@ -0,0 +1 @@ ++test1 +diff --git a/directory/file2 b/directory/file2 +new file mode 100644 +index 0000000..a5bce3f +--- /dev/null ++++ b/directory/file2 +@@ -0,0 +1 @@ ++test1 +diff --git a/file1 b/file1 +new file mode 100644 +index 0000000..88c39cd +--- /dev/null ++++ b/file1 +@@ -0,0 +1 @@ ++Here is a story that has been told throuhg the ages |