diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/COMMIT_EDITMSG b/test/integration/mergeConflictUndo/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..976d36736 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1,35 @@ +Merge branch 'develop' into other_branch + +# Conflicts: +# directory/file +# directory/file2 +# file1 +# file3 +# file4 +# file5 +# +# It looks like you may be committing a merge. +# If this is not correct, please remove the file +# /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/mergeConflictUndo/actual/.git/MERGE_HEAD +# and try again. + + +# Please enter the commit message for your changes. Lines starting +# with '#' will be ignored, and an empty message aborts the commit. +# +# On branch other_branch +# All conflicts fixed but you are still merging. +# +# Changes to be committed: +# new file: cherrypicking1 +# new file: cherrypicking2 +# new file: cherrypicking3 +# new file: cherrypicking4 +# new file: cherrypicking5 +# new file: cherrypicking6 +# new file: cherrypicking7 +# new file: cherrypicking8 +# new file: cherrypicking9 +# modified: directory/file +# modified: file1 +# diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/FETCH_HEAD b/test/integration/mergeConflictUndo/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/HEAD b/test/integration/mergeConflictUndo/expected/.git_keep/HEAD new file mode 100644 index 000000000..904a2e296 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/other_branch diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/ORIG_HEAD b/test/integration/mergeConflictUndo/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..c39f90780 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +ab172f11e9d1ffc28e53b7c5504f173bf1b27527 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/config b/test/integration/mergeConflictUndo/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/config @@ -0,0 +1,10 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true +[user] + email = CI@example.com + name = CI diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/description b/test/integration/mergeConflictUndo/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/index b/test/integration/mergeConflictUndo/expected/.git_keep/index new file mode 100644 index 000000000..680aeaeee Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/index differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/info/exclude b/test/integration/mergeConflictUndo/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/info/exclude @@ -0,0 +1,7 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ +.DS_Store diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/logs/HEAD b/test/integration/mergeConflictUndo/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..c185b357c --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/logs/HEAD @@ -0,0 +1,34 @@ +0000000000000000000000000000000000000000 db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 CI 1617319581 +1100 commit (initial): first commit +db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 CI 1617319581 +1100 checkout: moving from master to feature/cherry-picking +db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 1e953a069f4b657c300ea0464ecc13f9c2e34905 CI 1617319581 +1100 commit: first commit freshman year +1e953a069f4b657c300ea0464ecc13f9c2e34905 58151e1e14571021b5d38d941538a2e3c3d0e7a9 CI 1617319581 +1100 commit: second commit subway eat fresh +58151e1e14571021b5d38d941538a2e3c3d0e7a9 289b2994fdad04740a383797513c39dd183c87d3 CI 1617319581 +1100 commit: third commit fresh +289b2994fdad04740a383797513c39dd183c87d3 36d36a1d6a6e1fb7305747cf1cfedac0d3826e3e CI 1617319581 +1100 commit: fourth commit cool +36d36a1d6a6e1fb7305747cf1cfedac0d3826e3e 7f983b882d71782f6520493b14e45b1eb3888a57 CI 1617319581 +1100 commit: fifth commit nice +7f983b882d71782f6520493b14e45b1eb3888a57 8146e9924caf0aa2d21db44095ae5a0b0f6e1ce4 CI 1617319581 +1100 commit: sixth commit haha +8146e9924caf0aa2d21db44095ae5a0b0f6e1ce4 2c2a4608db50f4c6df0e4580119fd2627d160acd CI 1617319581 +1100 commit: seventh commit yeah +2c2a4608db50f4c6df0e4580119fd2627d160acd 7d80e0ed109e6802aa1f23a473200c9af3f8cf61 CI 1617319581 +1100 commit: eighth commit woo +7d80e0ed109e6802aa1f23a473200c9af3f8cf61 7d80e0ed109e6802aa1f23a473200c9af3f8cf61 CI 1617319581 +1100 checkout: moving from feature/cherry-picking to develop +7d80e0ed109e6802aa1f23a473200c9af3f8cf61 e503834faae098b6e456c2e2ab921737b3fd957c CI 1617319581 +1100 commit: first commit on develop +e503834faae098b6e456c2e2ab921737b3fd957c db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 CI 1617319581 +1100 checkout: moving from develop to master +db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 cad08b7e2fbbabb2235cc4ca7785f8ba00247d50 CI 1617319581 +1100 commit: first commit on master +cad08b7e2fbbabb2235cc4ca7785f8ba00247d50 e503834faae098b6e456c2e2ab921737b3fd957c CI 1617319581 +1100 checkout: moving from master to develop +e503834faae098b6e456c2e2ab921737b3fd957c 9e0b31da5b56c4dd7230a85fee330246c16845ac CI 1617319581 +1100 commit: second commit on develop +9e0b31da5b56c4dd7230a85fee330246c16845ac cad08b7e2fbbabb2235cc4ca7785f8ba00247d50 CI 1617319581 +1100 checkout: moving from develop to master +cad08b7e2fbbabb2235cc4ca7785f8ba00247d50 af2cd230f86b71f1b77a2b13fd090d88f13575e9 CI 1617319581 +1100 commit: second commit on master +af2cd230f86b71f1b77a2b13fd090d88f13575e9 9e0b31da5b56c4dd7230a85fee330246c16845ac CI 1617319581 +1100 checkout: moving from master to develop +9e0b31da5b56c4dd7230a85fee330246c16845ac 084111cdf3945cf795dfa651723e7e6a927e48ef CI 1617319581 +1100 commit: third commit on develop +084111cdf3945cf795dfa651723e7e6a927e48ef af2cd230f86b71f1b77a2b13fd090d88f13575e9 CI 1617319581 +1100 checkout: moving from develop to master +af2cd230f86b71f1b77a2b13fd090d88f13575e9 627a99630df8cc12c4acdebac3e3e8af1adf9711 CI 1617319581 +1100 commit: third commit on master +627a99630df8cc12c4acdebac3e3e8af1adf9711 084111cdf3945cf795dfa651723e7e6a927e48ef CI 1617319581 +1100 checkout: moving from master to develop +084111cdf3945cf795dfa651723e7e6a927e48ef 8b7aa507318e42a4efdae2c867d89590bbce48e5 CI 1617319581 +1100 commit: fourth commit on develop +8b7aa507318e42a4efdae2c867d89590bbce48e5 627a99630df8cc12c4acdebac3e3e8af1adf9711 CI 1617319581 +1100 checkout: moving from develop to master +627a99630df8cc12c4acdebac3e3e8af1adf9711 5e9fe3aa0c84eab154f6f8796804b9e2e0ab0401 CI 1617319581 +1100 commit: fourth commit on master +5e9fe3aa0c84eab154f6f8796804b9e2e0ab0401 5e9fe3aa0c84eab154f6f8796804b9e2e0ab0401 CI 1617319581 +1100 checkout: moving from master to base_branch +5e9fe3aa0c84eab154f6f8796804b9e2e0ab0401 7fdf0429a1e95f38736a260c5ed4121aa5d6e76f CI 1617319581 +1100 commit: file +7fdf0429a1e95f38736a260c5ed4121aa5d6e76f 7fdf0429a1e95f38736a260c5ed4121aa5d6e76f CI 1617319581 +1100 checkout: moving from base_branch to other_branch +7fdf0429a1e95f38736a260c5ed4121aa5d6e76f 7fdf0429a1e95f38736a260c5ed4121aa5d6e76f CI 1617319581 +1100 checkout: moving from other_branch to base_branch +7fdf0429a1e95f38736a260c5ed4121aa5d6e76f c4b40606be30048d61ed9bb55e21ecd612f34d7d CI 1617319581 +1100 commit: file changed +c4b40606be30048d61ed9bb55e21ecd612f34d7d 7fdf0429a1e95f38736a260c5ed4121aa5d6e76f CI 1617319581 +1100 checkout: moving from base_branch to other_branch +7fdf0429a1e95f38736a260c5ed4121aa5d6e76f ab172f11e9d1ffc28e53b7c5504f173bf1b27527 CI 1617319582 +1100 commit: asd +ab172f11e9d1ffc28e53b7c5504f173bf1b27527 0a71a0176c3eb0a7ccba7e8e675743aecb362f3a CI 1617319602 +1100 commit (merge): Merge branch 'develop' into other_branch diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/base_branch b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/base_branch new file mode 100644 index 000000000..64af6934b --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/base_branch @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 5e9fe3aa0c84eab154f6f8796804b9e2e0ab0401 CI 1617319581 +1100 branch: Created from HEAD +5e9fe3aa0c84eab154f6f8796804b9e2e0ab0401 7fdf0429a1e95f38736a260c5ed4121aa5d6e76f CI 1617319581 +1100 commit: file +7fdf0429a1e95f38736a260c5ed4121aa5d6e76f c4b40606be30048d61ed9bb55e21ecd612f34d7d CI 1617319581 +1100 commit: file changed diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/develop b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/develop new file mode 100644 index 000000000..abb04bbd5 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/develop @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 7d80e0ed109e6802aa1f23a473200c9af3f8cf61 CI 1617319581 +1100 branch: Created from HEAD +7d80e0ed109e6802aa1f23a473200c9af3f8cf61 e503834faae098b6e456c2e2ab921737b3fd957c CI 1617319581 +1100 commit: first commit on develop +e503834faae098b6e456c2e2ab921737b3fd957c 9e0b31da5b56c4dd7230a85fee330246c16845ac CI 1617319581 +1100 commit: second commit on develop +9e0b31da5b56c4dd7230a85fee330246c16845ac 084111cdf3945cf795dfa651723e7e6a927e48ef CI 1617319581 +1100 commit: third commit on develop +084111cdf3945cf795dfa651723e7e6a927e48ef 8b7aa507318e42a4efdae2c867d89590bbce48e5 CI 1617319581 +1100 commit: fourth commit on develop diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/feature/cherry-picking b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/feature/cherry-picking new file mode 100644 index 000000000..2b11e74e4 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/feature/cherry-picking @@ -0,0 +1,9 @@ +0000000000000000000000000000000000000000 db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 CI 1617319581 +1100 branch: Created from HEAD +db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 1e953a069f4b657c300ea0464ecc13f9c2e34905 CI 1617319581 +1100 commit: first commit freshman year +1e953a069f4b657c300ea0464ecc13f9c2e34905 58151e1e14571021b5d38d941538a2e3c3d0e7a9 CI 1617319581 +1100 commit: second commit subway eat fresh +58151e1e14571021b5d38d941538a2e3c3d0e7a9 289b2994fdad04740a383797513c39dd183c87d3 CI 1617319581 +1100 commit: third commit fresh +289b2994fdad04740a383797513c39dd183c87d3 36d36a1d6a6e1fb7305747cf1cfedac0d3826e3e CI 1617319581 +1100 commit: fourth commit cool +36d36a1d6a6e1fb7305747cf1cfedac0d3826e3e 7f983b882d71782f6520493b14e45b1eb3888a57 CI 1617319581 +1100 commit: fifth commit nice +7f983b882d71782f6520493b14e45b1eb3888a57 8146e9924caf0aa2d21db44095ae5a0b0f6e1ce4 CI 1617319581 +1100 commit: sixth commit haha +8146e9924caf0aa2d21db44095ae5a0b0f6e1ce4 2c2a4608db50f4c6df0e4580119fd2627d160acd CI 1617319581 +1100 commit: seventh commit yeah +2c2a4608db50f4c6df0e4580119fd2627d160acd 7d80e0ed109e6802aa1f23a473200c9af3f8cf61 CI 1617319581 +1100 commit: eighth commit woo diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/master b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..5959f88c3 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 CI 1617319581 +1100 commit (initial): first commit +db35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 cad08b7e2fbbabb2235cc4ca7785f8ba00247d50 CI 1617319581 +1100 commit: first commit on master +cad08b7e2fbbabb2235cc4ca7785f8ba00247d50 af2cd230f86b71f1b77a2b13fd090d88f13575e9 CI 1617319581 +1100 commit: second commit on master +af2cd230f86b71f1b77a2b13fd090d88f13575e9 627a99630df8cc12c4acdebac3e3e8af1adf9711 CI 1617319581 +1100 commit: third commit on master +627a99630df8cc12c4acdebac3e3e8af1adf9711 5e9fe3aa0c84eab154f6f8796804b9e2e0ab0401 CI 1617319581 +1100 commit: fourth commit on master diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/other_branch b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/other_branch new file mode 100644 index 000000000..1258a9d63 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/logs/refs/heads/other_branch @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 7fdf0429a1e95f38736a260c5ed4121aa5d6e76f CI 1617319581 +1100 branch: Created from HEAD +7fdf0429a1e95f38736a260c5ed4121aa5d6e76f ab172f11e9d1ffc28e53b7c5504f173bf1b27527 CI 1617319582 +1100 commit: asd +ab172f11e9d1ffc28e53b7c5504f173bf1b27527 0a71a0176c3eb0a7ccba7e8e675743aecb362f3a CI 1617319602 +1100 commit (merge): Merge branch 'develop' into other_branch diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/08/4111cdf3945cf795dfa651723e7e6a927e48ef b/test/integration/mergeConflictUndo/expected/.git_keep/objects/08/4111cdf3945cf795dfa651723e7e6a927e48ef new file mode 100644 index 000000000..4f28207f2 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/objects/08/4111cdf3945cf795dfa651723e7e6a927e48ef @@ -0,0 +1,3 @@ +xM +0F]dk@Dǘ$SZhx| ^{/m[tVE ؐ=fi +>׈ h&`H*{ 5eѺdrF$5v%r\* #܇)ގUnl w6(؞J \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/2c/2a4608db50f4c6df0e4580119fd2627d160acd b/test/integration/mergeConflictUndo/expected/.git_keep/objects/2c/2a4608db50f4c6df0e4580119fd2627d160acd new file mode 100644 index 000000000..fe5c7b62d Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/2c/2a4608db50f4c6df0e4580119fd2627d160acd differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 new file mode 100644 index 000000000..ed74cea0a Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/32/d15fd4451b6693a93d6420c8af6cfc99348e71 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/32/d15fd4451b6693a93d6420c8af6cfc99348e71 new file mode 100644 index 000000000..4a9f30d37 Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/32/d15fd4451b6693a93d6420c8af6cfc99348e71 differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd b/test/integration/mergeConflictUndo/expected/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd new file mode 100644 index 000000000..e8d63bced Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/36/d36a1d6a6e1fb7305747cf1cfedac0d3826e3e b/test/integration/mergeConflictUndo/expected/.git_keep/objects/36/d36a1d6a6e1fb7305747cf1cfedac0d3826e3e new file mode 100644 index 000000000..abe3e24cc Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/36/d36a1d6a6e1fb7305747cf1cfedac0d3826e3e differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c b/test/integration/mergeConflictUndo/expected/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c new file mode 100644 index 000000000..394c5a294 Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 new file mode 100644 index 000000000..74bc806ad --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 @@ -0,0 +1,2 @@ +xA +0E]ATzI34)ɴMK0 |>o\a83BQ/h Eǜ}aAsjAwތ1O*B|V'5C/Q&c۬5x70| \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 new file mode 100644 index 000000000..e0670d284 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 @@ -0,0 +1 @@ +x 0CvL\jVОW=M\\Vo ጨ:1O]e3*hO:bϪ? \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/72/df4fceb0be99deb091ece3f501ef80b39a876a b/test/integration/mergeConflictUndo/expected/.git_keep/objects/72/df4fceb0be99deb091ece3f501ef80b39a876a new file mode 100644 index 000000000..19670ff5a Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/72/df4fceb0be99deb091ece3f501ef80b39a876a differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 new file mode 100644 index 000000000..c41ae5c62 Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/7d/80e0ed109e6802aa1f23a473200c9af3f8cf61 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/7d/80e0ed109e6802aa1f23a473200c9af3f8cf61 new file mode 100644 index 000000000..7b77d9102 Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/7d/80e0ed109e6802aa1f23a473200c9af3f8cf61 differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/7f/983b882d71782f6520493b14e45b1eb3888a57 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/7f/983b882d71782f6520493b14e45b1eb3888a57 new file mode 100644 index 000000000..e8b43881c --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/objects/7f/983b882d71782f6520493b14e45b1eb3888a57 @@ -0,0 +1,3 @@ +xA +  ůkBV9>I&!Xf`duiià8tV> Q4amNQԞDRH +r] m=>O|R_VDƨS ,Wu/ҁ? \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/7f/df0429a1e95f38736a260c5ed4121aa5d6e76f b/test/integration/mergeConflictUndo/expected/.git_keep/objects/7f/df0429a1e95f38736a260c5ed4121aa5d6e76f new file mode 100644 index 000000000..1ff6e120f --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/objects/7f/df0429a1e95f38736a260c5ed4121aa5d6e76f @@ -0,0 +1,2 @@ +xM +0@a9E̴cLR"x|{o-2^j e=+iTCHAJfCz媣dr* R@ Omf{~+"99On겪p9 \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/81/46e9924caf0aa2d21db44095ae5a0b0f6e1ce4 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/81/46e9924caf0aa2d21db44095ae5a0b0f6e1ce4 new file mode 100644 index 000000000..7457a235e --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/objects/81/46e9924caf0aa2d21db44095ae5a0b0f6e1ce4 @@ -0,0 +1,3 @@ +xK +@D])z/Hz~!'acB!w գuYlOuW }ŋ3 +![Fv)dW}v&$9]B>$YԲ0pƻlOLrHgĮ3m~+(R|< \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d b/test/integration/mergeConflictUndo/expected/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d new file mode 100644 index 000000000..d63de558b Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 new file mode 100644 index 000000000..ea7fa5303 Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/8b/7aa507318e42a4efdae2c867d89590bbce48e5 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/8b/7aa507318e42a4efdae2c867d89590bbce48e5 new file mode 100644 index 000000000..068186500 Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/8b/7aa507318e42a4efdae2c867d89590bbce48e5 differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd b/test/integration/mergeConflictUndo/expected/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd new file mode 100644 index 000000000..cdd5f8a93 Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/91/65a12a95d3b2b9b8a0374de787af169b2c339e b/test/integration/mergeConflictUndo/expected/.git_keep/objects/91/65a12a95d3b2b9b8a0374de787af169b2c339e new file mode 100644 index 000000000..cc06d0590 Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/91/65a12a95d3b2b9b8a0374de787af169b2c339e differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c b/test/integration/mergeConflictUndo/expected/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c new file mode 100644 index 000000000..1befd67ac Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 new file mode 100644 index 000000000..ffc277c86 Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/9e/0b31da5b56c4dd7230a85fee330246c16845ac b/test/integration/mergeConflictUndo/expected/.git_keep/objects/9e/0b31da5b56c4dd7230a85fee330246c16845ac new file mode 100644 index 000000000..b83a45469 Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/9e/0b31da5b56c4dd7230a85fee330246c16845ac differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 000000000..285df3e5f Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/ab/172f11e9d1ffc28e53b7c5504f173bf1b27527 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/ab/172f11e9d1ffc28e53b7c5504f173bf1b27527 new file mode 100644 index 000000000..d98609f9c Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/ab/172f11e9d1ffc28e53b7c5504f173bf1b27527 differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/af/2cd230f86b71f1b77a2b13fd090d88f13575e9 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/af/2cd230f86b71f1b77a2b13fd090d88f13575e9 new file mode 100644 index 000000000..3db36405e Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/af/2cd230f86b71f1b77a2b13fd090d88f13575e9 differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c b/test/integration/mergeConflictUndo/expected/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c new file mode 100644 index 000000000..7302ca34e Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520 new file mode 100644 index 000000000..4aa46eb8c Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520 differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 new file mode 100644 index 000000000..008bb1a65 Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/c4/b40606be30048d61ed9bb55e21ecd612f34d7d b/test/integration/mergeConflictUndo/expected/.git_keep/objects/c4/b40606be30048d61ed9bb55e21ecd612f34d7d new file mode 100644 index 000000000..2552eac78 Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/c4/b40606be30048d61ed9bb55e21ecd612f34d7d differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/ca/d08b7e2fbbabb2235cc4ca7785f8ba00247d50 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/ca/d08b7e2fbbabb2235cc4ca7785f8ba00247d50 new file mode 100644 index 000000000..a28c77ab8 Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/ca/d08b7e2fbbabb2235cc4ca7785f8ba00247d50 differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 new file mode 100644 index 000000000..ab357ec23 Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 new file mode 100644 index 000000000..198bff1ec Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 new file mode 100644 index 000000000..af687b620 Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/db/35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/db/35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 new file mode 100644 index 000000000..a634f2a57 Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/db/35d1bf1bfbb57b4b345ee4f6f0554e9e72b015 differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c b/test/integration/mergeConflictUndo/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c new file mode 100644 index 000000000..74c919681 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c @@ -0,0 +1 @@ +x 0C?3ƵV=iO=,8tW@h*&R$j*yʑs-ܜ8v)u㧱VH" P \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/mergeConflictUndo/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 000000000..9b771fc2f Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e b/test/integration/mergeConflictUndo/expected/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e new file mode 100644 index 000000000..3a7ee91ea Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 new file mode 100644 index 000000000..714e20cb7 Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 new file mode 100644 index 000000000..83998943a Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/e5/03834faae098b6e456c2e2ab921737b3fd957c b/test/integration/mergeConflictUndo/expected/.git_keep/objects/e5/03834faae098b6e456c2e2ab921737b3fd957c new file mode 100644 index 000000000..f2a0385c5 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/objects/e5/03834faae098b6e456c2e2ab921737b3fd957c @@ -0,0 +1,2 @@ +xK +0@]d&_ADLj )1Ƿ>ރ47o 1$#rq&&>L8 c91 p 8R8y)3 6N.WA}@,uS_6? \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d b/test/integration/mergeConflictUndo/expected/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d new file mode 100644 index 000000000..b047d6827 Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 new file mode 100644 index 000000000..4992422c7 Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 new file mode 100644 index 000000000..3688d63f9 Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 new file mode 100644 index 000000000..e9f9f0881 Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 b/test/integration/mergeConflictUndo/expected/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 new file mode 100644 index 000000000..168b5c5f9 Binary files /dev/null and b/test/integration/mergeConflictUndo/expected/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 differ diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/base_branch b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/base_branch new file mode 100644 index 000000000..a0b7c7bb1 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/base_branch @@ -0,0 +1 @@ +c4b40606be30048d61ed9bb55e21ecd612f34d7d diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/develop b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/develop new file mode 100644 index 000000000..400785e4e --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/develop @@ -0,0 +1 @@ +8b7aa507318e42a4efdae2c867d89590bbce48e5 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/feature/cherry-picking b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/feature/cherry-picking new file mode 100644 index 000000000..dd50c1b77 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/feature/cherry-picking @@ -0,0 +1 @@ +7d80e0ed109e6802aa1f23a473200c9af3f8cf61 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/master b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..600f6b0ef --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +5e9fe3aa0c84eab154f6f8796804b9e2e0ab0401 diff --git a/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/other_branch b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/other_branch new file mode 100644 index 000000000..ce5ef7aa4 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/.git_keep/refs/heads/other_branch @@ -0,0 +1 @@ +0a71a0176c3eb0a7ccba7e8e675743aecb362f3a diff --git a/test/integration/mergeConflictUndo/expected/cherrypicking1 b/test/integration/mergeConflictUndo/expected/cherrypicking1 new file mode 100644 index 000000000..6101e9354 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/cherrypicking1 @@ -0,0 +1 @@ +this is file number 1 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictUndo/expected/cherrypicking2 b/test/integration/mergeConflictUndo/expected/cherrypicking2 new file mode 100644 index 000000000..889b0fdfe --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/cherrypicking2 @@ -0,0 +1 @@ +this is file number 2 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictUndo/expected/cherrypicking3 b/test/integration/mergeConflictUndo/expected/cherrypicking3 new file mode 100644 index 000000000..eb90e8d7b --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/cherrypicking3 @@ -0,0 +1 @@ +this is file number 3 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictUndo/expected/cherrypicking4 b/test/integration/mergeConflictUndo/expected/cherrypicking4 new file mode 100644 index 000000000..b4121e2d6 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/cherrypicking4 @@ -0,0 +1 @@ +this is file number 4 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictUndo/expected/cherrypicking5 b/test/integration/mergeConflictUndo/expected/cherrypicking5 new file mode 100644 index 000000000..afa76754c --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/cherrypicking5 @@ -0,0 +1 @@ +this is file number 5 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictUndo/expected/cherrypicking6 b/test/integration/mergeConflictUndo/expected/cherrypicking6 new file mode 100644 index 000000000..18f469bc7 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/cherrypicking6 @@ -0,0 +1 @@ +this is file number 6 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictUndo/expected/cherrypicking7 b/test/integration/mergeConflictUndo/expected/cherrypicking7 new file mode 100644 index 000000000..e448ae5bf --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/cherrypicking7 @@ -0,0 +1 @@ +this is file number 7 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictUndo/expected/cherrypicking8 b/test/integration/mergeConflictUndo/expected/cherrypicking8 new file mode 100644 index 000000000..90a84fd62 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/cherrypicking8 @@ -0,0 +1 @@ +this is file number 8 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictUndo/expected/cherrypicking9 b/test/integration/mergeConflictUndo/expected/cherrypicking9 new file mode 100644 index 000000000..22b0fd807 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/cherrypicking9 @@ -0,0 +1 @@ +this is file number 9 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictUndo/expected/directory/file b/test/integration/mergeConflictUndo/expected/directory/file new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/directory/file @@ -0,0 +1 @@ +test2 diff --git a/test/integration/mergeConflictUndo/expected/directory/file2 b/test/integration/mergeConflictUndo/expected/directory/file2 new file mode 100644 index 000000000..df6b0d2bc --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/directory/file2 @@ -0,0 +1 @@ +test3 diff --git a/test/integration/mergeConflictUndo/expected/file b/test/integration/mergeConflictUndo/expected/file new file mode 100644 index 000000000..2410ee12b --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/file @@ -0,0 +1 @@ +new2\noriginal2\noriginal3 diff --git a/test/integration/mergeConflictUndo/expected/file1 b/test/integration/mergeConflictUndo/expected/file1 new file mode 100644 index 000000000..5d874a902 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/file1 @@ -0,0 +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 dog diff --git a/test/integration/mergeConflictUndo/expected/file3 b/test/integration/mergeConflictUndo/expected/file3 new file mode 100644 index 000000000..e3ae5c6d8 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/file3 @@ -0,0 +1 @@ +once upon a time there was a horse diff --git a/test/integration/mergeConflictUndo/expected/file4 b/test/integration/mergeConflictUndo/expected/file4 new file mode 100644 index 000000000..e3ae5c6d8 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/file4 @@ -0,0 +1 @@ +once upon a time there was a horse diff --git a/test/integration/mergeConflictUndo/expected/file5 b/test/integration/mergeConflictUndo/expected/file5 new file mode 100644 index 000000000..e3ae5c6d8 --- /dev/null +++ b/test/integration/mergeConflictUndo/expected/file5 @@ -0,0 +1 @@ +once upon a time there was a horse diff --git a/test/integration/mergeConflictUndo/recording.json b/test/integration/mergeConflictUndo/recording.json new file mode 100644 index 000000000..59ef81733 --- /dev/null +++ b/test/integration/mergeConflictUndo/recording.json @@ -0,0 +1 @@ +[{"Timestamp":28,"Event":{"Type":1,"Mod":0,"Key":0,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":0,"Bytes":null}},{"Timestamp":468,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":675,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":99,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"Yw=="}},{"Timestamp":764,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":97,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"YQ=="}},{"Timestamp":820,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":115,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"cw=="}},{"Timestamp":877,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":1084,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":1470,"Event":{"Type":0,"Mod":0,"Key":65514,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09D"}},{"Timestamp":1613,"Event":{"Type":0,"Mod":0,"Key":65514,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09D"}},{"Timestamp":1805,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":2101,"Event":{"Type":0,"Mod":0,"Key":65515,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09E"}},{"Timestamp":2268,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":2389,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":2548,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":3316,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":77,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"TQ=="}},{"Timestamp":3700,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":4444,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":5284,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":5613,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":5900,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":6684,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":6924,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":7148,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":8195,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":8604,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":9197,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":9669,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":122,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"eg=="}},{"Timestamp":10190,"Event":{"Type":0,"Mod":0,"Key":65514,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09D"}},{"Timestamp":10788,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":11244,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":12036,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":122,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"eg=="}},{"Timestamp":12557,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":13109,"Event":{"Type":0,"Mod":0,"Key":65514,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09D"}},{"Timestamp":13612,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":13853,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":14893,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":15324,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":17380,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":18036,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":18364,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":18621,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":18908,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":19189,"Event":{"Type":0,"Mod":0,"Key":32,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"IA=="}},{"Timestamp":20308,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":21452,"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/mergeConflictUndo/setup.sh b/test/integration/mergeConflictUndo/setup.sh new file mode 100644 index 000000000..0d9a57cf9 --- /dev/null +++ b/test/integration/mergeConflictUndo/setup.sh @@ -0,0 +1,156 @@ +#!/bin/sh + +cd $1 + +git init +git config user.email "CI@example.com" +git config user.name "CI" + + +function add_spacing { + for i in {1..60} + do + echo "..." >> $1 + done +} + +mkdir directory +echo "test1" > directory/file +echo "test1" > directory/file2 + + +echo "Here is a story that has been told throuhg the ages" >> file1 + +git add file1 +git add directory +git commit -m "first commit" + +git checkout -b feature/cherry-picking + +echo "this is file number 1 that I'm going to cherry-pick" > cherrypicking1 +echo "this is file number 2 that I'm going to cherry-pick" > cherrypicking2 + +git add . + +git commit -am "first commit freshman year" + +echo "this is file number 3 that I'm going to cherry-pick" > cherrypicking3 + +git add . + +git commit -am "second commit subway eat fresh" + +echo "this is file number 4 that I'm going to cherry-pick" > cherrypicking4 + +git add . + +git commit -am "third commit fresh" + +echo "this is file number 5 that I'm going to cherry-pick" > cherrypicking5 + +git add . + +git commit -am "fourth commit cool" + +echo "this is file number 6 that I'm going to cherry-pick" > cherrypicking6 + +git add . + +git commit -am "fifth commit nice" + +echo "this is file number 7 that I'm going to cherry-pick" > cherrypicking7 + +git add . + +git commit -am "sixth commit haha" + +echo "this is file number 8 that I'm going to cherry-pick" > cherrypicking8 + +git add . + +git commit -am "seventh commit yeah" + +echo "this is file number 9 that I'm going to cherry-pick" > cherrypicking9 + +git add . + +git commit -am "eighth commit woo" + + +git checkout -b develop +echo "once upon a time there was a dog" >> file1 +add_spacing file1 +echo "once upon a time there was another dog" >> file1 +git add file1 +echo "test2" > directory/file +echo "test2" > directory/file2 +git add directory +git commit -m "first commit on develop" + + +git checkout master +echo "once upon a time there was a cat" >> file1 +add_spacing file1 +echo "once upon a time there was another cat" >> file1 +git add file1 +echo "test3" > directory/file +echo "test3" > directory/file2 +git add directory +git commit -m "first commit on master" + + +git checkout develop +echo "once upon a time there was a mouse" >> file3 +git add file3 +git commit -m "second commit on develop" + + +git checkout master +echo "once upon a time there was a horse" >> file3 +git add file3 +git commit -m "second commit on master" + + +git checkout develop +echo "once upon a time there was a mouse" >> file4 +git add file4 +git commit -m "third commit on develop" + + +git checkout master +echo "once upon a time there was a horse" >> file4 +git add file4 +git commit -m "third commit on master" + + +git checkout develop +echo "once upon a time there was a mouse" >> file5 +git add file5 +git commit -m "fourth commit on develop" + + +git checkout master +echo "once upon a time there was a horse" >> file5 +git add file5 +git commit -m "fourth commit on master" + + +# this is for the autostash feature + +git checkout -b base_branch + +echo "original1\noriginal2\noriginal3" > file +git add file +git commit -m "file" + +git checkout -b other_branch + +git checkout base_branch + +echo "new1\noriginal2\noriginal3" > file +git add file +git commit -m "file changed" + +git checkout other_branch + +echo "new2\noriginal2\noriginal3" > file diff --git a/test/integration/mergeConflictUndo/test.json b/test/integration/mergeConflictUndo/test.json new file mode 100644 index 000000000..5ce11f66a --- /dev/null +++ b/test/integration/mergeConflictUndo/test.json @@ -0,0 +1 @@ +{ "description": "In this test we make use of the undo feature in the merge conflict context", "speed": 12 }