From b5e325b0a487f9ae6122d8410c393f60ea40251d Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sun, 19 Feb 2023 14:47:07 +1100 Subject: [PATCH] migrate revert merge test --- pkg/integration/components/menu_driver.go | 12 +++++ pkg/integration/components/shell.go | 4 ++ pkg/integration/tests/commit/revert_merge.go | 43 ++++++++++++++++++ pkg/integration/tests/shared/conflicts.go | 8 ++++ pkg/integration/tests/tests_gen.go | 1 + .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 0 .../expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/ORIG_HEAD | 1 - .../expected/repo/.git_keep/config | 10 ---- .../expected/repo/.git_keep/description | 1 - .../expected/repo/.git_keep/index | Bin 423 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 --- .../expected/repo/.git_keep/logs/HEAD | 12 ----- .../repo/.git_keep/logs/refs/heads/another | 2 - .../repo/.git_keep/logs/refs/heads/master | 1 - .../repo/.git_keep/logs/refs/heads/other | 8 ---- .../1e/7d643e0db24ebee10f92aa2f8099d50dbe0f0f | Bin 148 -> 0 bytes .../3c/3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 | Bin 147 -> 0 bytes .../41/bed9f222cc54e68d7846dc010bea6d23bea33e | Bin 59 -> 0 bytes .../61/3e54e7fd6e080d53ef44c18ecd33c545ac0e08 | Bin 56 -> 0 bytes .../89/8618af3fef6edf472d0f4a483ed8010d7bcfbb | Bin 52 -> 0 bytes .../98/f656b294e5f3b447e3fd66814a80d0d4080627 | Bin 59 -> 0 bytes .../9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 | Bin 20 -> 0 bytes .../a4/942a576eec3a1a15fb790c942b6860331bee32 | 2 - .../a7/fd052c52f174943cdea637f2d11f5ab7d090cd | Bin 63 -> 0 bytes .../ba/4581dc53b5b2ff56803651dfd79245203d546b | Bin 196 -> 0 bytes .../be/5b46b808c9c808be26710daeb2ce9ed2c7a070 | Bin 67 -> 0 bytes .../c5/af43f6cc1d51ebb3ab4800347595541f81799c | Bin 63 -> 0 bytes .../d3/b35176a575d48743900b1f0863cefbc198f84c | Bin 118 -> 0 bytes .../dd/ad764e9e78b555cd41e5e81f8ce969cfa3972c | 2 - .../e5/265503c8aea2860fc4754c1025e4597530ce0e | 1 - .../fa/0b6bf64815f57729716334319596c926b6564a | Bin 149 -> 0 bytes .../repo/.git_keep/refs/heads/another | 1 - .../expected/repo/.git_keep/refs/heads/master | 1 - .../expected/repo/.git_keep/refs/heads/other | 1 - .../mergeConflictRevert/expected/repo/file1 | 1 - .../mergeConflictRevert/expected/repo/file2 | 1 - .../mergeConflictRevert/expected/repo/file4 | 1 - .../mergeConflictRevert/expected/repo/file5 | 1 - .../mergeConflictRevert/recording.json | 1 - test/integration/mergeConflictRevert/setup.sh | 40 ---------------- .../integration/mergeConflictRevert/test.json | 1 - 43 files changed, 68 insertions(+), 98 deletions(-) create mode 100644 pkg/integration/tests/commit/revert_merge.go delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/ORIG_HEAD delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/config delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/description delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/index delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/another delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/other delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/1e/7d643e0db24ebee10f92aa2f8099d50dbe0f0f delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/3c/3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/41/bed9f222cc54e68d7846dc010bea6d23bea33e delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/61/3e54e7fd6e080d53ef44c18ecd33c545ac0e08 delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/89/8618af3fef6edf472d0f4a483ed8010d7bcfbb delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/98/f656b294e5f3b447e3fd66814a80d0d4080627 delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/a4/942a576eec3a1a15fb790c942b6860331bee32 delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/a7/fd052c52f174943cdea637f2d11f5ab7d090cd delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/ba/4581dc53b5b2ff56803651dfd79245203d546b delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/be/5b46b808c9c808be26710daeb2ce9ed2c7a070 delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/c5/af43f6cc1d51ebb3ab4800347595541f81799c delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/d3/b35176a575d48743900b1f0863cefbc198f84c delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/dd/ad764e9e78b555cd41e5e81f8ce969cfa3972c delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/e5/265503c8aea2860fc4754c1025e4597530ce0e delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/fa/0b6bf64815f57729716334319596c926b6564a delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/another delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/other delete mode 100644 test/integration/mergeConflictRevert/expected/repo/file1 delete mode 100644 test/integration/mergeConflictRevert/expected/repo/file2 delete mode 100644 test/integration/mergeConflictRevert/expected/repo/file4 delete mode 100644 test/integration/mergeConflictRevert/expected/repo/file5 delete mode 100644 test/integration/mergeConflictRevert/recording.json delete mode 100644 test/integration/mergeConflictRevert/setup.sh delete mode 100644 test/integration/mergeConflictRevert/test.json diff --git a/pkg/integration/components/menu_driver.go b/pkg/integration/components/menu_driver.go index 00e1b1dc9..b8155aaf7 100644 --- a/pkg/integration/components/menu_driver.go +++ b/pkg/integration/components/menu_driver.go @@ -36,6 +36,18 @@ func (self *MenuDriver) Select(option *matcher) *MenuDriver { return self } +func (self *MenuDriver) Lines(matchers ...*matcher) *MenuDriver { + self.getViewDriver().Lines(matchers...) + + return self +} + +func (self *MenuDriver) TopLines(matchers ...*matcher) *MenuDriver { + self.getViewDriver().TopLines(matchers...) + + return self +} + func (self *MenuDriver) checkNecessaryChecksCompleted() { if !self.hasCheckedTitle { self.t.Fail("You must check the title of a menu popup by calling Title() before calling Confirm()/Cancel().") diff --git a/pkg/integration/components/shell.go b/pkg/integration/components/shell.go index 9b7beca7c..ad4964507 100644 --- a/pkg/integration/components/shell.go +++ b/pkg/integration/components/shell.go @@ -116,6 +116,10 @@ func (self *Shell) Merge(name string) *Shell { return self.RunCommand("git merge --commit --no-ff " + name) } +func (self *Shell) ContinueMerge() *Shell { + return self.RunCommand("git -c core.editor=true merge --continue") +} + func (self *Shell) GitAdd(path string) *Shell { return self.RunCommand(fmt.Sprintf("git add \"%s\"", path)) } diff --git a/pkg/integration/tests/commit/revert_merge.go b/pkg/integration/tests/commit/revert_merge.go new file mode 100644 index 000000000..94b967916 --- /dev/null +++ b/pkg/integration/tests/commit/revert_merge.go @@ -0,0 +1,43 @@ +package commit + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" + "github.com/jesseduffield/lazygit/pkg/integration/tests/shared" +) + +var RevertMerge = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Reverts a merge commit and chooses to revert to the parent commit", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shared.CreateMergeCommit(shell) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits().Focus(). + TopLines( + Contains("Merge branch 'second-change-branch' into first-change-branch").IsSelected(), + ). + Press(keys.Commits.RevertCommit) + + t.ExpectPopup().Menu(). + Title(Equals("Select parent commit for merge")). + Lines( + Contains("first change"), + Contains("second-change-branch unrelated change"), + Contains("cancel"), + ). + Select(Contains("first change")). + Confirm() + + t.Views().Commits().IsFocused(). + TopLines( + Contains("Revert \"Merge branch 'second-change-branch' into first-change-branch\""), + Contains("Merge branch 'second-change-branch' into first-change-branch").IsSelected(), + ). + SelectPreviousItem() + + t.Views().Main().Content(Contains("-Second Change").Contains("+First Change")) + }, +}) diff --git a/pkg/integration/tests/shared/conflicts.go b/pkg/integration/tests/shared/conflicts.go index f01125c91..345636981 100644 --- a/pkg/integration/tests/shared/conflicts.go +++ b/pkg/integration/tests/shared/conflicts.go @@ -47,3 +47,11 @@ var MergeConflictsSetup = func(shell *Shell) { EmptyCommit("second-change-branch unrelated change"). Checkout("first-change-branch") } + +var CreateMergeCommit = func(shell *Shell) { + MergeConflictsSetup(shell) + + shell.RunShellCommandExpectError("git merge --no-edit second-change-branch") + shell.UpdateFileAndAdd("file", SecondChangeFileContent) + shell.ContinueMerge() +} diff --git a/pkg/integration/tests/tests_gen.go b/pkg/integration/tests/tests_gen.go index ecd0ced70..70a85a1ee 100644 --- a/pkg/integration/tests/tests_gen.go +++ b/pkg/integration/tests/tests_gen.go @@ -40,6 +40,7 @@ var tests = []*components.IntegrationTest{ commit.DiscardOldFileChange, commit.NewBranch, commit.Revert, + commit.RevertMerge, commit.StageRangeOfLines, commit.Staged, commit.StagedWithoutHooks, diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/mergeConflictRevert/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 9daeafb98..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/FETCH_HEAD b/test/integration/mergeConflictRevert/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/HEAD b/test/integration/mergeConflictRevert/expected/repo/.git_keep/HEAD deleted file mode 100644 index 0ca960536..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/other diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/ORIG_HEAD b/test/integration/mergeConflictRevert/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index bf57b6527..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -e5265503c8aea2860fc4754c1025e4597530ce0e diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/config b/test/integration/mergeConflictRevert/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/mergeConflictRevert/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/mergeConflictRevert/expected/repo/.git_keep/description b/test/integration/mergeConflictRevert/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/mergeConflictRevert/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/mergeConflictRevert/expected/repo/.git_keep/index b/test/integration/mergeConflictRevert/expected/repo/.git_keep/index deleted file mode 100644 index 7b55ac98880f5fd297662fef5471a8de746822fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 423 zcmZ?q402{*U|<4bmW17MXRJ=C-h|PN3=FIcMd5E47#f!_Ffe`vsu2NV*17A}?`-q= zVi3A+^1co0uN}YWvVRE!Yg%Sbsv%ICfdQ!hEW?2tH()fxoCtQ}%`t+T!)%qj0b~w{ zhMJ>Jyg4Rtb675J1-lDGL(Op`-W*e~IUzx=u0Vz)gNcFx*U|OP-_FPezTUjrgTbV9 zYKVMe<(webP*7mnfr7%A!O+0K%)|sn88BcAHf&;5+j8DZ#_%(gs%`K&XKu&3WG+V^ E0KVUtjQ{`u diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/info/exclude b/test/integration/mergeConflictRevert/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/mergeConflictRevert/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/mergeConflictRevert/expected/repo/.git_keep/logs/HEAD b/test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index d2c3533b1..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,12 +0,0 @@ -0000000000000000000000000000000000000000 d3b35176a575d48743900b1f0863cefbc198f84c CI 1622875852 +1000 commit (initial): test 1 -d3b35176a575d48743900b1f0863cefbc198f84c d3b35176a575d48743900b1f0863cefbc198f84c CI 1622875853 +1000 checkout: moving from master to other -d3b35176a575d48743900b1f0863cefbc198f84c 3c3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 CI 1622875853 +1000 commit: test 2 -3c3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 3c3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 CI 1622875853 +1000 checkout: moving from other to another -3c3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 1e7d643e0db24ebee10f92aa2f8099d50dbe0f0f CI 1622875853 +1000 commit: test 3 -1e7d643e0db24ebee10f92aa2f8099d50dbe0f0f 3c3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 CI 1622875853 +1000 checkout: moving from another to other -3c3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 fa0b6bf64815f57729716334319596c926b6564a CI 1622875853 +1000 commit: test 4 -fa0b6bf64815f57729716334319596c926b6564a ba4581dc53b5b2ff56803651dfd79245203d546b CI 1622875853 +1000 merge another: Merge made by the 'recursive' strategy. -ba4581dc53b5b2ff56803651dfd79245203d546b a4942a576eec3a1a15fb790c942b6860331bee32 CI 1622875853 +1000 commit: test 5 -a4942a576eec3a1a15fb790c942b6860331bee32 e5265503c8aea2860fc4754c1025e4597530ce0e CI 1622875856 +1000 revert: Revert "Merge branch 'another' into other" -e5265503c8aea2860fc4754c1025e4597530ce0e a4942a576eec3a1a15fb790c942b6860331bee32 CI 1622875860 +1000 reset: moving to a4942a576eec3a1a15fb790c942b6860331bee32 -a4942a576eec3a1a15fb790c942b6860331bee32 ddad764e9e78b555cd41e5e81f8ce969cfa3972c CI 1622875862 +1000 commit: test diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/another b/test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/another deleted file mode 100644 index 0c750bad0..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/another +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 3c3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 CI 1622875853 +1000 branch: Created from HEAD -3c3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 1e7d643e0db24ebee10f92aa2f8099d50dbe0f0f CI 1622875853 +1000 commit: test 3 diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 63a4baf99..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 d3b35176a575d48743900b1f0863cefbc198f84c CI 1622875852 +1000 commit (initial): test 1 diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/other b/test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/other deleted file mode 100644 index 3d3e05626..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/logs/refs/heads/other +++ /dev/null @@ -1,8 +0,0 @@ -0000000000000000000000000000000000000000 d3b35176a575d48743900b1f0863cefbc198f84c CI 1622875853 +1000 branch: Created from HEAD -d3b35176a575d48743900b1f0863cefbc198f84c 3c3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 CI 1622875853 +1000 commit: test 2 -3c3594b2fd655fb7ffe36077ee8a9c3f79fb5fc6 fa0b6bf64815f57729716334319596c926b6564a CI 1622875853 +1000 commit: test 4 -fa0b6bf64815f57729716334319596c926b6564a ba4581dc53b5b2ff56803651dfd79245203d546b CI 1622875853 +1000 merge another: Merge made by the 'recursive' strategy. -ba4581dc53b5b2ff56803651dfd79245203d546b a4942a576eec3a1a15fb790c942b6860331bee32 CI 1622875853 +1000 commit: test 5 -a4942a576eec3a1a15fb790c942b6860331bee32 e5265503c8aea2860fc4754c1025e4597530ce0e CI 1622875856 +1000 revert: Revert "Merge branch 'another' into other" -e5265503c8aea2860fc4754c1025e4597530ce0e a4942a576eec3a1a15fb790c942b6860331bee32 CI 1622875860 +1000 reset: moving to a4942a576eec3a1a15fb790c942b6860331bee32 -a4942a576eec3a1a15fb790c942b6860331bee32 ddad764e9e78b555cd41e5e81f8ce969cfa3972c CI 1622875862 +1000 commit: test diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/1e/7d643e0db24ebee10f92aa2f8099d50dbe0f0f b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/1e/7d643e0db24ebee10f92aa2f8099d50dbe0f0f deleted file mode 100644 index 9bc4b492bb429d8fc5069b26636771875e448199..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gaAH3IZ_@06pgwxeJn{(^)`7@HEdzI^8H3XBZ>+eDefP1w|c-*4`gO z+YE=XGiz@vw=B*%BJ>5j^!7>1Kn1v86`v`SuB3XXY@vwD#yg zBOm%^27%bbTdXA*CM?2My;n-6g;~W*R@{wS^JcFOg=ZFuAxo6vQ}jF{&Qvi4R;#np zm}>Is@~7XI4Q>;hZ`0Mjxvft->C!GhVHi@BBn(GFM7Ps@s@tEr>-O$2xF3jVIew3Z BM)d#y diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/41/bed9f222cc54e68d7846dc010bea6d23bea33e b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/41/bed9f222cc54e68d7846dc010bea6d23bea33e deleted file mode 100644 index 823da94ec4f602adc5ccf51118d6471e29b9acba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 59 zcmV-B0L1@z0V^p=O;xb8WH2-^Ff%bxNXyJgHDs8(ZvDn88pu>RWdi!S?@ RASo~+q`(-f0sw2=F!|6V=y!@Ff%bxNXyJgHDs8(ZvDn88pu>RWdi!S?@ OASp1yssI2;kRf1a*%!_L diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/89/8618af3fef6edf472d0f4a483ed8010d7bcfbb b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/89/8618af3fef6edf472d0f4a483ed8010d7bcfbb deleted file mode 100644 index 3f22e700010979c8aace27afa8c24396749b8482..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52 zcmV-40L%Y)0Rbrh*8g;JWn~~UGXOC#Fg7$aAZBT7WibGquCKXn88pu>RWdi!S?@ RASo~+q`(BL0sw3BF#6^M8p!|v diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 deleted file mode 100644 index 4667dcf6f2b51dda01be1dd1679b0195ab0e185a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20 bcmb7HexU|FfcPQQAo?oNi}4cyKeo?HlHsBq3b5^+pzxH@ry3| Vmmn!HBBa2WkOC8|3IL?JK(P>48wLOX diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/ba/4581dc53b5b2ff56803651dfd79245203d546b b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/ba/4581dc53b5b2ff56803651dfd79245203d546b deleted file mode 100644 index f2995f30069a126884c2a442585d2aca8a89e651..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 196 zcmV;#06YJ90gaC_Y6CG408`&9wsR2(tCh4mK?nv{F7k+#w3{>d?u?Kj&(9G^pKchY znYyp*Z2N1pNyJw7Nw+y8Ecy!(sdhPf`yB5m|e7(66NIB z``}%UnQJC49688e?=&?IUa=JlT2vicCK0k3b8hkQiiS4Hb1Zv@%N5=)*Ry`h`nc;` y-PaFrOf;uBM-Q(K5vRi*6GQ)*PoLVq6iSz^E^v}7Gi5L|FfcPQQAo?oNi}4cyKeo?HlHsBq3b5^+pzxH@ry3| Zmmn!HBBa2WkOC7z3QVyo007f!P)v7<8%_WK diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/c5/af43f6cc1d51ebb3ab4800347595541f81799c b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/c5/af43f6cc1d51ebb3ab4800347595541f81799c deleted file mode 100644 index a11ab4a6cf37664dba50381ad2b722f769e71aeb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 63 zcmV-F0Korv0V^p=O;s>7HexU|FfcPQQAo?oNi}4cyKeo?HlHsBq3b5^+pzxH@ry3| Vmmn!HBBa2CkOEVz3IL@BK(h~M8iD`- diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/d3/b35176a575d48743900b1f0863cefbc198f84c b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/d3/b35176a575d48743900b1f0863cefbc198f84c deleted file mode 100644 index a2cdf6ec8f1e8831821b1955d9ca7035958dc113..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 118 zcmV-+0Ez#20gaAH3IZ_@06pgweHWyY$gL?@_R0sA46m;$IuNr%K!iX diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/dd/ad764e9e78b555cd41e5e81f8ce969cfa3972c b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/dd/ad764e9e78b555cd41e5e81f8ce969cfa3972c deleted file mode 100644 index 2d746cac5..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/dd/ad764e9e78b555cd41e5e81f8ce969cfa3972c +++ /dev/null @@ -1,2 +0,0 @@ -xM -1 @a=E$mf5Hcuw-,?łZ!n(7Bs D(`˘Ja9RTHk9XU3el|/'Ybt.'#ugn8 \ No newline at end of file diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/e5/265503c8aea2860fc4754c1025e4597530ce0e b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/e5/265503c8aea2860fc4754c1025e4597530ce0e deleted file mode 100644 index cde3bd747..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/e5/265503c8aea2860fc4754c1025e4597530ce0e +++ /dev/null @@ -1 +0,0 @@ -xPj0Y_CKkWR)^J`%bCmY-zy1e穃#Л]R̀Frv} ћMH7Y:O2) 9$]v6S$"*|U~x}ʩ 6HhjgQ])W-MU 7^G^>J;´8m h.c"EPG݀ӟq*#/W`A`ϯ3J>`6Cyg&*R&$' l' \ No newline at end of file diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/fa/0b6bf64815f57729716334319596c926b6564a b/test/integration/mergeConflictRevert/expected/repo/.git_keep/objects/fa/0b6bf64815f57729716334319596c926b6564a deleted file mode 100644 index a6bc9c709fe6b906e02461da49358ecfd5cff7bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmV;G0BZku0gcW<3c@fDKvCB@MfQSBGMPyNB7&oOk3CSr3^CayjQA;lU(6x5kHxlj_!Fb7D$KAN>`@){N!QV!MchDd8v6=aA}B$eDy zW7bOA*p$z>FPpth_I#VJ@-2OR%Bd~=VjX**A|*n5bO2!Xx=#)Hlba#$VT1Vrd~Z3d D6D>iF diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/another b/test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/another deleted file mode 100644 index 24e534ce9..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/another +++ /dev/null @@ -1 +0,0 @@ -1e7d643e0db24ebee10f92aa2f8099d50dbe0f0f diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/master b/test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 249ffa1c2..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -d3b35176a575d48743900b1f0863cefbc198f84c diff --git a/test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/other b/test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/other deleted file mode 100644 index b22b268a7..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/.git_keep/refs/heads/other +++ /dev/null @@ -1 +0,0 @@ -ddad764e9e78b555cd41e5e81f8ce969cfa3972c diff --git a/test/integration/mergeConflictRevert/expected/repo/file1 b/test/integration/mergeConflictRevert/expected/repo/file1 deleted file mode 100644 index 9daeafb98..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/file1 +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/test/integration/mergeConflictRevert/expected/repo/file2 b/test/integration/mergeConflictRevert/expected/repo/file2 deleted file mode 100644 index 9daeafb98..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/file2 +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/test/integration/mergeConflictRevert/expected/repo/file4 b/test/integration/mergeConflictRevert/expected/repo/file4 deleted file mode 100644 index 9daeafb98..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/file4 +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/test/integration/mergeConflictRevert/expected/repo/file5 b/test/integration/mergeConflictRevert/expected/repo/file5 deleted file mode 100644 index 9daeafb98..000000000 --- a/test/integration/mergeConflictRevert/expected/repo/file5 +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/test/integration/mergeConflictRevert/recording.json b/test/integration/mergeConflictRevert/recording.json deleted file mode 100644 index bbb4056aa..000000000 --- a/test/integration/mergeConflictRevert/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":1730,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2002,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2305,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2968,"Mod":0,"Key":256,"Ch":116},{"Timestamp":3402,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3985,"Mod":0,"Key":257,"Ch":0},{"Timestamp":4304,"Mod":0,"Key":257,"Ch":0},{"Timestamp":5850,"Mod":0,"Key":258,"Ch":0},{"Timestamp":6785,"Mod":0,"Key":256,"Ch":103},{"Timestamp":7441,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7978,"Mod":0,"Key":260,"Ch":0},{"Timestamp":8304,"Mod":0,"Key":260,"Ch":0},{"Timestamp":8585,"Mod":0,"Key":256,"Ch":99},{"Timestamp":8816,"Mod":0,"Key":256,"Ch":116},{"Timestamp":8873,"Mod":0,"Key":256,"Ch":101},{"Timestamp":9041,"Mod":0,"Key":256,"Ch":115},{"Timestamp":9081,"Mod":0,"Key":256,"Ch":116},{"Timestamp":9416,"Mod":0,"Key":13,"Ch":13},{"Timestamp":11041,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":135,"Height":74}]} \ No newline at end of file diff --git a/test/integration/mergeConflictRevert/setup.sh b/test/integration/mergeConflictRevert/setup.sh deleted file mode 100644 index aa3eb68c7..000000000 --- a/test/integration/mergeConflictRevert/setup.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init -git config user.email "CI@example.com" -git config user.name "CI" - -git checkout -b master - -echo "test" > file1 -git add . -git commit -m "test 1" - -git checkout -b other - -echo "test" > file2 -git add . -git commit -m "test 2" - -git checkout -b another - -echo "test" > file3 -git add . -git commit -m "test 3" - -git checkout other - -echo "test" > file4 -git add . -git commit -m "test 4" - -git merge another - -echo "test" > file5 -git add . -git commit -m "test 5" - diff --git a/test/integration/mergeConflictRevert/test.json b/test/integration/mergeConflictRevert/test.json deleted file mode 100644 index d6ccd0d39..000000000 --- a/test/integration/mergeConflictRevert/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "In this test we revert a merge conflict, choosing which parent we want to retain... or something like that. We need to rename the newly created commit so that we don't fail on the snapshot comparison", "speed": 10 }