diff --git a/pkg/integration/tests/conflicts/undo_choose_hunk.go b/pkg/integration/tests/conflicts/undo_choose_hunk.go new file mode 100644 index 000000000..0f2575304 --- /dev/null +++ b/pkg/integration/tests/conflicts/undo_choose_hunk.go @@ -0,0 +1,34 @@ +package conflicts + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" + "github.com/jesseduffield/lazygit/pkg/integration/tests/shared" +) + +var UndoChooseHunk = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Chooses a hunk when resolving a merge conflict and then undoes the choice", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shared.CreateMergeConflictFileMultiple(shell) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + IsFocused(). + Lines( + Contains("UU file").IsSelected(), + ). + PressEnter() + + t.Views().MergeConflicts(). + IsFocused(). + Content(Contains("<<<<<<< HEAD\nFirst Change")). + PressPrimaryAction(). + // choosing the first hunk + Content(DoesNotContain("<<<<<<< HEAD\nFirst Change")). + Press(keys.Universal.Undo). + Content(Contains("<<<<<<< HEAD\nFirst Change")) + }, +}) diff --git a/pkg/integration/tests/shared/conflicts.go b/pkg/integration/tests/shared/conflicts.go index 345636981..39a37cc37 100644 --- a/pkg/integration/tests/shared/conflicts.go +++ b/pkg/integration/tests/shared/conflicts.go @@ -48,10 +48,96 @@ var MergeConflictsSetup = func(shell *Shell) { Checkout("first-change-branch") } -var CreateMergeCommit = func(shell *Shell) { +var CreateMergeConflictFile = func(shell *Shell) { MergeConflictsSetup(shell) shell.RunShellCommandExpectError("git merge --no-edit second-change-branch") +} + +var CreateMergeCommit = func(shell *Shell) { + CreateMergeConflictFile(shell) shell.UpdateFileAndAdd("file", SecondChangeFileContent) shell.ContinueMerge() } + +// These 'multiple' variants are just like the short ones but with longer file contents and with multiple conflicts within the file. + +var OriginalFileContentMultiple = ` +This +Is +The +Original +File +.. +It +Is +Longer +Than +The +Other +Options +` + +var FirstChangeFileContentMultiple = ` +This +Is +The +First Change +File +.. +It +Is +Longer +Than +The +Other +Other First Change +` + +var SecondChangeFileContentMultiple = ` +This +Is +The +Second Change +File +.. +It +Is +Longer +Than +The +Other +Other Second Change +` + +// prepares us for a rebase/merge that has conflicts +var MergeConflictsSetupMultiple = func(shell *Shell) { + shell. + NewBranch("original-branch"). + EmptyCommit("one"). + EmptyCommit("two"). + EmptyCommit("three"). + CreateFileAndAdd("file", OriginalFileContentMultiple). + Commit("original"). + NewBranch("first-change-branch"). + UpdateFileAndAdd("file", FirstChangeFileContentMultiple). + Commit("first change"). + Checkout("original-branch"). + NewBranch("second-change-branch"). + UpdateFileAndAdd("file", SecondChangeFileContentMultiple). + Commit("second change"). + EmptyCommit("second-change-branch unrelated change"). + Checkout("first-change-branch") +} + +var CreateMergeConflictFileMultiple = func(shell *Shell) { + MergeConflictsSetupMultiple(shell) + + shell.RunShellCommandExpectError("git merge --no-edit second-change-branch") +} + +var CreateMergeCommitMultiple = func(shell *Shell) { + CreateMergeConflictFileMultiple(shell) + shell.UpdateFileAndAdd("file", SecondChangeFileContentMultiple) + shell.ContinueMerge() +} diff --git a/pkg/integration/tests/tests_gen.go b/pkg/integration/tests/tests_gen.go index 70a85a1ee..c3637cbb9 100644 --- a/pkg/integration/tests/tests_gen.go +++ b/pkg/integration/tests/tests_gen.go @@ -9,6 +9,7 @@ import ( "github.com/jesseduffield/lazygit/pkg/integration/tests/cherry_pick" "github.com/jesseduffield/lazygit/pkg/integration/tests/commit" "github.com/jesseduffield/lazygit/pkg/integration/tests/config" + "github.com/jesseduffield/lazygit/pkg/integration/tests/conflicts" "github.com/jesseduffield/lazygit/pkg/integration/tests/custom_commands" "github.com/jesseduffield/lazygit/pkg/integration/tests/diff" "github.com/jesseduffield/lazygit/pkg/integration/tests/file" @@ -46,6 +47,7 @@ var tests = []*components.IntegrationTest{ commit.StagedWithoutHooks, commit.Unstaged, config.RemoteNamedStar, + conflicts.UndoChooseHunk, custom_commands.Basic, custom_commands.FormPrompts, custom_commands.MenuFromCommand, diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/mergeConflictUndo/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index d72af3146..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -asd diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/FETCH_HEAD b/test/integration/mergeConflictUndo/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/HEAD b/test/integration/mergeConflictUndo/expected/repo/.git_keep/HEAD deleted file mode 100644 index 904a2e296..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/other_branch diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/MERGE_HEAD b/test/integration/mergeConflictUndo/expected/repo/.git_keep/MERGE_HEAD deleted file mode 100644 index b4d7d5850..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/MERGE_HEAD +++ /dev/null @@ -1 +0,0 @@ -82db6d0e4502f489719ea0f3dbe7e14413c6d28a diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/MERGE_MODE b/test/integration/mergeConflictUndo/expected/repo/.git_keep/MERGE_MODE deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/MERGE_MSG b/test/integration/mergeConflictUndo/expected/repo/.git_keep/MERGE_MSG deleted file mode 100644 index 33462aeb1..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/MERGE_MSG +++ /dev/null @@ -1,9 +0,0 @@ -Merge branch 'develop' into other_branch - -# Conflicts: -# directory/file -# directory/file2 -# file1 -# file3 -# file4 -# file5 diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/ORIG_HEAD b/test/integration/mergeConflictUndo/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index d324b15b4..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -8cd762c119834784fdbf97e9bb3b4c15e804ebaa diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/config b/test/integration/mergeConflictUndo/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/config +++ /dev/null @@ -1,10 +0,0 @@ -[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/repo/.git_keep/description b/test/integration/mergeConflictUndo/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/index b/test/integration/mergeConflictUndo/expected/repo/.git_keep/index deleted file mode 100644 index 42f7d29fe..000000000 Binary files a/test/integration/mergeConflictUndo/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/info/exclude b/test/integration/mergeConflictUndo/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/info/exclude +++ /dev/null @@ -1,7 +0,0 @@ -# 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/repo/.git_keep/logs/HEAD b/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 84a8cf021..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,33 +0,0 @@ -0000000000000000000000000000000000000000 31f2a971f823279ba1ef877be7599da288f6e24b CI 1617671430 +1000 commit (initial): first commit -31f2a971f823279ba1ef877be7599da288f6e24b 31f2a971f823279ba1ef877be7599da288f6e24b CI 1617671430 +1000 checkout: moving from master to feature/cherry-picking -31f2a971f823279ba1ef877be7599da288f6e24b 3d1213374cd86b841f034768571d0b5f2c870a16 CI 1617671430 +1000 commit: first commit freshman year -3d1213374cd86b841f034768571d0b5f2c870a16 d25721fffa7dc911ff2a9102bef201db225e2f16 CI 1617671430 +1000 commit: second commit subway eat fresh -d25721fffa7dc911ff2a9102bef201db225e2f16 dbf5ab9a4fa3f976d266f3be50670aa83121b420 CI 1617671430 +1000 commit: third commit fresh -dbf5ab9a4fa3f976d266f3be50670aa83121b420 687ff9526e0d56fafe1445ee4c182a83afc3cc35 CI 1617671430 +1000 commit: fourth commit cool -687ff9526e0d56fafe1445ee4c182a83afc3cc35 17dc45dd142947e06cf7e635d62f2c0acbb86da7 CI 1617671430 +1000 commit: fifth commit nice -17dc45dd142947e06cf7e635d62f2c0acbb86da7 c27ef6b4964209a875191eca7e56605c8efa5eee CI 1617671430 +1000 commit: sixth commit haha -c27ef6b4964209a875191eca7e56605c8efa5eee 5dc2e019349371e9b3e4f1be99754ba70094cad6 CI 1617671430 +1000 commit: seventh commit yeah -5dc2e019349371e9b3e4f1be99754ba70094cad6 c50f7e1375a30118c2886d4b31318579f3419231 CI 1617671430 +1000 commit: eighth commit woo -c50f7e1375a30118c2886d4b31318579f3419231 c50f7e1375a30118c2886d4b31318579f3419231 CI 1617671430 +1000 checkout: moving from feature/cherry-picking to develop -c50f7e1375a30118c2886d4b31318579f3419231 18c07ac9568c564ececb199f78f64babc92214cb CI 1617671430 +1000 commit: first commit on develop -18c07ac9568c564ececb199f78f64babc92214cb 31f2a971f823279ba1ef877be7599da288f6e24b CI 1617671430 +1000 checkout: moving from develop to master -31f2a971f823279ba1ef877be7599da288f6e24b 442a53c1b023b4816085fdc4eaa85d0c5fd897e2 CI 1617671430 +1000 commit: first commit on master -442a53c1b023b4816085fdc4eaa85d0c5fd897e2 18c07ac9568c564ececb199f78f64babc92214cb CI 1617671430 +1000 checkout: moving from master to develop -18c07ac9568c564ececb199f78f64babc92214cb 7bc178be031c4645110e9accb4accf16902d2d7f CI 1617671430 +1000 commit: second commit on develop -7bc178be031c4645110e9accb4accf16902d2d7f 442a53c1b023b4816085fdc4eaa85d0c5fd897e2 CI 1617671430 +1000 checkout: moving from develop to master -442a53c1b023b4816085fdc4eaa85d0c5fd897e2 ced01df5f1a270490c1b9d4efe5ceb0c53626279 CI 1617671430 +1000 commit: second commit on master -ced01df5f1a270490c1b9d4efe5ceb0c53626279 7bc178be031c4645110e9accb4accf16902d2d7f CI 1617671430 +1000 checkout: moving from master to develop -7bc178be031c4645110e9accb4accf16902d2d7f 6dfbfa4bd19cb38608681df40ebb3a78bd13a824 CI 1617671430 +1000 commit: third commit on develop -6dfbfa4bd19cb38608681df40ebb3a78bd13a824 ced01df5f1a270490c1b9d4efe5ceb0c53626279 CI 1617671430 +1000 checkout: moving from develop to master -ced01df5f1a270490c1b9d4efe5ceb0c53626279 c9b473bec307b18fd94a913658f4d759be63ca47 CI 1617671430 +1000 commit: third commit on master -c9b473bec307b18fd94a913658f4d759be63ca47 6dfbfa4bd19cb38608681df40ebb3a78bd13a824 CI 1617671430 +1000 checkout: moving from master to develop -6dfbfa4bd19cb38608681df40ebb3a78bd13a824 82db6d0e4502f489719ea0f3dbe7e14413c6d28a CI 1617671430 +1000 commit: fourth commit on develop -82db6d0e4502f489719ea0f3dbe7e14413c6d28a c9b473bec307b18fd94a913658f4d759be63ca47 CI 1617671430 +1000 checkout: moving from develop to master -c9b473bec307b18fd94a913658f4d759be63ca47 279f068805e089660f7ddd17ff32f66100e0dca5 CI 1617671430 +1000 commit: fourth commit on master -279f068805e089660f7ddd17ff32f66100e0dca5 279f068805e089660f7ddd17ff32f66100e0dca5 CI 1617671430 +1000 checkout: moving from master to base_branch -279f068805e089660f7ddd17ff32f66100e0dca5 08e2576bb7cd0dd9be54f9a523c4bedea0643557 CI 1617671430 +1000 commit: file -08e2576bb7cd0dd9be54f9a523c4bedea0643557 08e2576bb7cd0dd9be54f9a523c4bedea0643557 CI 1617671430 +1000 checkout: moving from base_branch to other_branch -08e2576bb7cd0dd9be54f9a523c4bedea0643557 08e2576bb7cd0dd9be54f9a523c4bedea0643557 CI 1617671430 +1000 checkout: moving from other_branch to base_branch -08e2576bb7cd0dd9be54f9a523c4bedea0643557 4e5d3ae0b6e865073bcbd79531a75c55bf7bfcb4 CI 1617671430 +1000 commit: file changed -4e5d3ae0b6e865073bcbd79531a75c55bf7bfcb4 08e2576bb7cd0dd9be54f9a523c4bedea0643557 CI 1617671430 +1000 checkout: moving from base_branch to other_branch -08e2576bb7cd0dd9be54f9a523c4bedea0643557 8cd762c119834784fdbf97e9bb3b4c15e804ebaa CI 1617671431 +1000 commit: asd diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/base_branch b/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/base_branch deleted file mode 100644 index 79e7c0fa4..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/base_branch +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 279f068805e089660f7ddd17ff32f66100e0dca5 CI 1617671430 +1000 branch: Created from HEAD -279f068805e089660f7ddd17ff32f66100e0dca5 08e2576bb7cd0dd9be54f9a523c4bedea0643557 CI 1617671430 +1000 commit: file -08e2576bb7cd0dd9be54f9a523c4bedea0643557 4e5d3ae0b6e865073bcbd79531a75c55bf7bfcb4 CI 1617671430 +1000 commit: file changed diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/develop b/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/develop deleted file mode 100644 index 6a9c5917a..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/develop +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 c50f7e1375a30118c2886d4b31318579f3419231 CI 1617671430 +1000 branch: Created from HEAD -c50f7e1375a30118c2886d4b31318579f3419231 18c07ac9568c564ececb199f78f64babc92214cb CI 1617671430 +1000 commit: first commit on develop -18c07ac9568c564ececb199f78f64babc92214cb 7bc178be031c4645110e9accb4accf16902d2d7f CI 1617671430 +1000 commit: second commit on develop -7bc178be031c4645110e9accb4accf16902d2d7f 6dfbfa4bd19cb38608681df40ebb3a78bd13a824 CI 1617671430 +1000 commit: third commit on develop -6dfbfa4bd19cb38608681df40ebb3a78bd13a824 82db6d0e4502f489719ea0f3dbe7e14413c6d28a CI 1617671430 +1000 commit: fourth commit on develop diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/feature/cherry-picking b/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/feature/cherry-picking deleted file mode 100644 index 81521b06f..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/feature/cherry-picking +++ /dev/null @@ -1,9 +0,0 @@ -0000000000000000000000000000000000000000 31f2a971f823279ba1ef877be7599da288f6e24b CI 1617671430 +1000 branch: Created from HEAD -31f2a971f823279ba1ef877be7599da288f6e24b 3d1213374cd86b841f034768571d0b5f2c870a16 CI 1617671430 +1000 commit: first commit freshman year -3d1213374cd86b841f034768571d0b5f2c870a16 d25721fffa7dc911ff2a9102bef201db225e2f16 CI 1617671430 +1000 commit: second commit subway eat fresh -d25721fffa7dc911ff2a9102bef201db225e2f16 dbf5ab9a4fa3f976d266f3be50670aa83121b420 CI 1617671430 +1000 commit: third commit fresh -dbf5ab9a4fa3f976d266f3be50670aa83121b420 687ff9526e0d56fafe1445ee4c182a83afc3cc35 CI 1617671430 +1000 commit: fourth commit cool -687ff9526e0d56fafe1445ee4c182a83afc3cc35 17dc45dd142947e06cf7e635d62f2c0acbb86da7 CI 1617671430 +1000 commit: fifth commit nice -17dc45dd142947e06cf7e635d62f2c0acbb86da7 c27ef6b4964209a875191eca7e56605c8efa5eee CI 1617671430 +1000 commit: sixth commit haha -c27ef6b4964209a875191eca7e56605c8efa5eee 5dc2e019349371e9b3e4f1be99754ba70094cad6 CI 1617671430 +1000 commit: seventh commit yeah -5dc2e019349371e9b3e4f1be99754ba70094cad6 c50f7e1375a30118c2886d4b31318579f3419231 CI 1617671430 +1000 commit: eighth commit woo diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 20c99ff0a..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 31f2a971f823279ba1ef877be7599da288f6e24b CI 1617671430 +1000 commit (initial): first commit -31f2a971f823279ba1ef877be7599da288f6e24b 442a53c1b023b4816085fdc4eaa85d0c5fd897e2 CI 1617671430 +1000 commit: first commit on master -442a53c1b023b4816085fdc4eaa85d0c5fd897e2 ced01df5f1a270490c1b9d4efe5ceb0c53626279 CI 1617671430 +1000 commit: second commit on master -ced01df5f1a270490c1b9d4efe5ceb0c53626279 c9b473bec307b18fd94a913658f4d759be63ca47 CI 1617671430 +1000 commit: third commit on master -c9b473bec307b18fd94a913658f4d759be63ca47 279f068805e089660f7ddd17ff32f66100e0dca5 CI 1617671430 +1000 commit: fourth commit on master diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/other_branch b/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/other_branch deleted file mode 100644 index f188d6a1c..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/other_branch +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 08e2576bb7cd0dd9be54f9a523c4bedea0643557 CI 1617671430 +1000 branch: Created from HEAD -08e2576bb7cd0dd9be54f9a523c4bedea0643557 8cd762c119834784fdbf97e9bb3b4c15e804ebaa CI 1617671431 +1000 commit: asd diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/08/e2576bb7cd0dd9be54f9a523c4bedea0643557 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/08/e2576bb7cd0dd9be54f9a523c4bedea0643557 deleted file mode 100644 index 4fd3d95f4..000000000 Binary files a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/08/e2576bb7cd0dd9be54f9a523c4bedea0643557 and /dev/null differ diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d deleted file mode 100644 index 8d42c4c9e..000000000 Binary files a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d and /dev/null differ diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 deleted file mode 100644 index 25389c9d6..000000000 Binary files a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 and /dev/null differ diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c deleted file mode 100644 index fd879a5f3..000000000 Binary files a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c and /dev/null differ diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/17/dc45dd142947e06cf7e635d62f2c0acbb86da7 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/17/dc45dd142947e06cf7e635d62f2c0acbb86da7 deleted file mode 100644 index a042d47f2..000000000 Binary files a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/17/dc45dd142947e06cf7e635d62f2c0acbb86da7 and /dev/null differ diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/18/c07ac9568c564ececb199f78f64babc92214cb b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/18/c07ac9568c564ececb199f78f64babc92214cb deleted file mode 100644 index a58cdfd1c..000000000 Binary files a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/18/c07ac9568c564ececb199f78f64babc92214cb and /dev/null differ diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 deleted file mode 100644 index 9b8af5fe7..000000000 Binary files a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 and /dev/null differ diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca deleted file mode 100644 index 2b02dc3d1..000000000 Binary files a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca and /dev/null differ diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 deleted file mode 100644 index 1cafb95f9..000000000 Binary files a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 and /dev/null differ diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af deleted file mode 100644 index 27c11bb26..000000000 Binary files a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af and /dev/null differ diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 deleted file mode 100644 index 991774643..000000000 Binary files a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 and /dev/null differ diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/24/10ee12b940bade9d9e99413732faa6dc60adb1 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/24/10ee12b940bade9d9e99413732faa6dc60adb1 deleted file mode 100644 index 6204b1f1d..000000000 Binary files a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/24/10ee12b940bade9d9e99413732faa6dc60adb1 and /dev/null differ diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 deleted file mode 100644 index 864410e1e..000000000 Binary files a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 and /dev/null differ diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/27/94411aa7b73b44f533fb862cdb9dbfd13c5d92 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/27/94411aa7b73b44f533fb862cdb9dbfd13c5d92 deleted file mode 100644 index 9f053b7ba..000000000 Binary files a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/27/94411aa7b73b44f533fb862cdb9dbfd13c5d92 and /dev/null differ diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/27/9f068805e089660f7ddd17ff32f66100e0dca5 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/27/9f068805e089660f7ddd17ff32f66100e0dca5 deleted file mode 100644 index 0ea06804c..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/27/9f068805e089660f7ddd17ff32f66100e0dca5 +++ /dev/null @@ -1,3 +0,0 @@ -xA -0E]$cҤc2P4%-xk)WԧDXa@5iL#,)ENj&kzǜ c!3L+RL3ܦ!*K.\;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/repo/.git_keep/objects/3d/1213374cd86b841f034768571d0b5f2c870a16 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/3d/1213374cd86b841f034768571d0b5f2c870a16 deleted file mode 100644 index 7fafc3d92..000000000 Binary files a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/3d/1213374cd86b841f034768571d0b5f2c870a16 and /dev/null differ diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/44/2a53c1b023b4816085fdc4eaa85d0c5fd897e2 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/44/2a53c1b023b4816085fdc4eaa85d0c5fd897e2 deleted file mode 100644 index cc8df6e44..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/44/2a53c1b023b4816085fdc4eaa85d0c5fd897e2 +++ /dev/null @@ -1,2 +0,0 @@ -xK -@ @])dU N[</quj-&IDeyJc1!57 kѦ>x׵sN(풋1,NBZ(;\K/R ShC8"ֶSU͡R~26_z1@ \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 deleted file mode 100644 index ab357ec23..000000000 Binary files a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 and /dev/null differ diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/d2/5721fffa7dc911ff2a9102bef201db225e2f16 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/d2/5721fffa7dc911ff2a9102bef201db225e2f16 deleted file mode 100644 index 035d7ebef..000000000 Binary files a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/d2/5721fffa7dc911ff2a9102bef201db225e2f16 and /dev/null differ diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 deleted file mode 100644 index 198bff1ec..000000000 Binary files a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 and /dev/null differ diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 deleted file mode 100644 index af687b620..000000000 Binary files a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 and /dev/null differ diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/db/f5ab9a4fa3f976d266f3be50670aa83121b420 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/db/f5ab9a4fa3f976d266f3be50670aa83121b420 deleted file mode 100644 index aa4879a75..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/db/f5ab9a4fa3f976d266f3be50670aa83121b420 +++ /dev/null @@ -1,3 +0,0 @@ -xA -0E]df$DzdfBkK-xw{e]{Fh xTI9yQTL,0j7>kT@GRJ*@ -#ifƅK6 .tOZd]@bwGBDT?u{UUPf>? \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c deleted file mode 100644 index 74c919681..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c +++ /dev/null @@ -1 +0,0 @@ -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/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e deleted file mode 100644 index 3a7ee91ea..000000000 Binary files a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e and /dev/null differ diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 deleted file mode 100644 index 714e20cb7..000000000 Binary files a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 and /dev/null differ diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 deleted file mode 100644 index 83998943a..000000000 Binary files a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 and /dev/null differ diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d deleted file mode 100644 index b047d6827..000000000 Binary files a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d and /dev/null differ diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 deleted file mode 100644 index 4992422c7..000000000 Binary files a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 and /dev/null differ diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 deleted file mode 100644 index 3688d63f9..000000000 Binary files a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 and /dev/null differ diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 deleted file mode 100644 index e9f9f0881..000000000 Binary files a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 and /dev/null differ diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 deleted file mode 100644 index 168b5c5f9..000000000 Binary files a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 and /dev/null differ diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/base_branch b/test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/base_branch deleted file mode 100644 index 60c28ebd6..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/base_branch +++ /dev/null @@ -1 +0,0 @@ -4e5d3ae0b6e865073bcbd79531a75c55bf7bfcb4 diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/develop b/test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/develop deleted file mode 100644 index b4d7d5850..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/develop +++ /dev/null @@ -1 +0,0 @@ -82db6d0e4502f489719ea0f3dbe7e14413c6d28a diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/feature/cherry-picking b/test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/feature/cherry-picking deleted file mode 100644 index 02e8ef0f4..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/feature/cherry-picking +++ /dev/null @@ -1 +0,0 @@ -c50f7e1375a30118c2886d4b31318579f3419231 diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/master b/test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index d4f5ac796..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -279f068805e089660f7ddd17ff32f66100e0dca5 diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/other_branch b/test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/other_branch deleted file mode 100644 index d324b15b4..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/other_branch +++ /dev/null @@ -1 +0,0 @@ -8cd762c119834784fdbf97e9bb3b4c15e804ebaa diff --git a/test/integration/mergeConflictUndo/expected/repo/cherrypicking1 b/test/integration/mergeConflictUndo/expected/repo/cherrypicking1 deleted file mode 100644 index 6101e9354..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/cherrypicking1 +++ /dev/null @@ -1 +0,0 @@ -this is file number 1 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictUndo/expected/repo/cherrypicking2 b/test/integration/mergeConflictUndo/expected/repo/cherrypicking2 deleted file mode 100644 index 889b0fdfe..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/cherrypicking2 +++ /dev/null @@ -1 +0,0 @@ -this is file number 2 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictUndo/expected/repo/cherrypicking3 b/test/integration/mergeConflictUndo/expected/repo/cherrypicking3 deleted file mode 100644 index eb90e8d7b..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/cherrypicking3 +++ /dev/null @@ -1 +0,0 @@ -this is file number 3 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictUndo/expected/repo/cherrypicking4 b/test/integration/mergeConflictUndo/expected/repo/cherrypicking4 deleted file mode 100644 index b4121e2d6..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/cherrypicking4 +++ /dev/null @@ -1 +0,0 @@ -this is file number 4 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictUndo/expected/repo/cherrypicking5 b/test/integration/mergeConflictUndo/expected/repo/cherrypicking5 deleted file mode 100644 index afa76754c..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/cherrypicking5 +++ /dev/null @@ -1 +0,0 @@ -this is file number 5 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictUndo/expected/repo/cherrypicking6 b/test/integration/mergeConflictUndo/expected/repo/cherrypicking6 deleted file mode 100644 index 18f469bc7..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/cherrypicking6 +++ /dev/null @@ -1 +0,0 @@ -this is file number 6 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictUndo/expected/repo/cherrypicking7 b/test/integration/mergeConflictUndo/expected/repo/cherrypicking7 deleted file mode 100644 index e448ae5bf..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/cherrypicking7 +++ /dev/null @@ -1 +0,0 @@ -this is file number 7 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictUndo/expected/repo/cherrypicking8 b/test/integration/mergeConflictUndo/expected/repo/cherrypicking8 deleted file mode 100644 index 90a84fd62..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/cherrypicking8 +++ /dev/null @@ -1 +0,0 @@ -this is file number 8 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictUndo/expected/repo/cherrypicking9 b/test/integration/mergeConflictUndo/expected/repo/cherrypicking9 deleted file mode 100644 index 22b0fd807..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/cherrypicking9 +++ /dev/null @@ -1 +0,0 @@ -this is file number 9 that I'm going to cherry-pick diff --git a/test/integration/mergeConflictUndo/expected/repo/directory/file b/test/integration/mergeConflictUndo/expected/repo/directory/file deleted file mode 100644 index 9165a12a9..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/directory/file +++ /dev/null @@ -1,5 +0,0 @@ -<<<<<<< HEAD -test3 -======= -test2 ->>>>>>> develop diff --git a/test/integration/mergeConflictUndo/expected/repo/directory/file2 b/test/integration/mergeConflictUndo/expected/repo/directory/file2 deleted file mode 100644 index 9165a12a9..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/directory/file2 +++ /dev/null @@ -1,5 +0,0 @@ -<<<<<<< HEAD -test3 -======= -test2 ->>>>>>> develop diff --git a/test/integration/mergeConflictUndo/expected/repo/file b/test/integration/mergeConflictUndo/expected/repo/file deleted file mode 100644 index 2410ee12b..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/file +++ /dev/null @@ -1 +0,0 @@ -new2\noriginal2\noriginal3 diff --git a/test/integration/mergeConflictUndo/expected/repo/file1 b/test/integration/mergeConflictUndo/expected/repo/file1 deleted file mode 100644 index 5d874a902..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/file1 +++ /dev/null @@ -1,63 +0,0 @@ -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/repo/file3 b/test/integration/mergeConflictUndo/expected/repo/file3 deleted file mode 100644 index 32d15fd44..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/file3 +++ /dev/null @@ -1,5 +0,0 @@ -<<<<<<< HEAD -once upon a time there was a horse -======= -once upon a time there was a mouse ->>>>>>> develop diff --git a/test/integration/mergeConflictUndo/expected/repo/file4 b/test/integration/mergeConflictUndo/expected/repo/file4 deleted file mode 100644 index 32d15fd44..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/file4 +++ /dev/null @@ -1,5 +0,0 @@ -<<<<<<< HEAD -once upon a time there was a horse -======= -once upon a time there was a mouse ->>>>>>> develop diff --git a/test/integration/mergeConflictUndo/expected/repo/file5 b/test/integration/mergeConflictUndo/expected/repo/file5 deleted file mode 100644 index 32d15fd44..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/file5 +++ /dev/null @@ -1,5 +0,0 @@ -<<<<<<< HEAD -once upon a time there was a horse -======= -once upon a time there was a mouse ->>>>>>> develop diff --git a/test/integration/mergeConflictUndo/recording.json b/test/integration/mergeConflictUndo/recording.json deleted file mode 100644 index efb7e9c14..000000000 --- a/test/integration/mergeConflictUndo/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":428,"Mod":0,"Key":256,"Ch":32},{"Timestamp":540,"Mod":0,"Key":256,"Ch":99},{"Timestamp":732,"Mod":0,"Key":256,"Ch":97},{"Timestamp":789,"Mod":0,"Key":256,"Ch":115},{"Timestamp":820,"Mod":0,"Key":256,"Ch":100},{"Timestamp":980,"Mod":0,"Key":13,"Ch":13},{"Timestamp":1445,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1796,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1949,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2037,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2700,"Mod":0,"Key":256,"Ch":77},{"Timestamp":2932,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3612,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3941,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4125,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4348,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4677,"Mod":0,"Key":257,"Ch":0},{"Timestamp":4884,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5364,"Mod":0,"Key":258,"Ch":0},{"Timestamp":5596,"Mod":0,"Key":256,"Ch":32},{"Timestamp":6244,"Mod":0,"Key":256,"Ch":122},{"Timestamp":6532,"Mod":0,"Key":257,"Ch":0},{"Timestamp":6716,"Mod":0,"Key":256,"Ch":32},{"Timestamp":7348,"Mod":0,"Key":258,"Ch":0},{"Timestamp":7588,"Mod":0,"Key":256,"Ch":32},{"Timestamp":8772,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":127,"Height":35}]} \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/setup.sh b/test/integration/mergeConflictUndo/setup.sh deleted file mode 100644 index 5182e5eae..000000000 --- a/test/integration/mergeConflictUndo/setup.sh +++ /dev/null @@ -1,158 +0,0 @@ -#!/bin/sh - -set -e - -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 deleted file mode 100644 index 5ce11f66a..000000000 --- a/test/integration/mergeConflictUndo/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "In this test we make use of the undo feature in the merge conflict context", "speed": 12 }