From 93b9e1bd1950033932f3b620ffdb06640298f22d Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sun, 19 Feb 2023 15:01:57 +1100 Subject: [PATCH] migrate merge conflict undo test --- .../tests/conflicts/undo_choose_hunk.go | 34 ++++ pkg/integration/tests/shared/conflicts.go | 88 +++++++++- pkg/integration/tests/tests_gen.go | 2 + .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 0 .../expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/MERGE_HEAD | 1 - .../expected/repo/.git_keep/MERGE_MODE | 0 .../expected/repo/.git_keep/MERGE_MSG | 9 - .../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 2118 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 - .../expected/repo/.git_keep/logs/HEAD | 33 ---- .../.git_keep/logs/refs/heads/base_branch | 3 - .../repo/.git_keep/logs/refs/heads/develop | 5 - .../logs/refs/heads/feature/cherry-picking | 9 - .../repo/.git_keep/logs/refs/heads/master | 5 - .../.git_keep/logs/refs/heads/other_branch | 2 - .../08/e2576bb7cd0dd9be54f9a523c4bedea0643557 | Bin 146 -> 0 bytes .../09/cbe8c6717c06a61876b7b641a46a62bf3c585d | Bin 112 -> 0 bytes .../17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 | Bin 34 -> 0 bytes .../17/4a8c9444cfa700682d74059d9fa9be5749242c | Bin 177 -> 0 bytes .../17/dc45dd142947e06cf7e635d62f2c0acbb86da7 | Bin 153 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../18/c07ac9568c564ececb199f78f64babc92214cb | Bin 159 -> 0 bytes .../18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 | Bin 66 -> 0 bytes .../1b/9ae5f5dff631baaa180a30afd9983f83dc27ca | Bin 50 -> 0 bytes .../20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 | Bin 144 -> 0 bytes .../21/78af7503938665881174069be4d48fa483e4af | Bin 117 -> 0 bytes .../22/b0fd807dd5e428c2d818aef6a2311d7c11e885 | Bin 66 -> 0 bytes .../24/10ee12b940bade9d9e99413732faa6dc60adb1 | Bin 34 -> 0 bytes .../24/6f7487e08e6330ccbec4053e701145d53f64d4 | Bin 327 -> 0 bytes .../27/94411aa7b73b44f533fb862cdb9dbfd13c5d92 | Bin 145 -> 0 bytes .../27/9f068805e089660f7ddd17ff32f66100e0dca5 | 3 - .../2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 | Bin 150 -> 0 bytes .../31/f2a971f823279ba1ef877be7599da288f6e24b | Bin 121 -> 0 bytes .../32/d15fd4451b6693a93d6420c8af6cfc99348e71 | Bin 80 -> 0 bytes .../34/c74161eef968fc951cf170a011fa8abfeddbcd | Bin 120 -> 0 bytes .../36/e0ef3e52c6e29e64980c71defbab6064d2da8c | Bin 252 -> 0 bytes .../38/08a710b52a152bb73805fe274e0d877cf61800 | 2 - .../3d/1213374cd86b841f034768571d0b5f2c870a16 | Bin 161 -> 0 bytes .../44/2a53c1b023b4816085fdc4eaa85d0c5fd897e2 | 2 - .../4e/5d3ae0b6e865073bcbd79531a75c55bf7bfcb4 | 2 - .../4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 | 1 - .../5d/874a902548f753e50944827e572a7470aa9731 | Bin 107 -> 0 bytes .../5d/a4d9200457542d875fe4def54ac98c16332db0 | Bin 33 -> 0 bytes .../5d/c2e019349371e9b3e4f1be99754ba70094cad6 | 2 - .../5f/3e4598b46a912f0f95a4898743e979343c82f3 | Bin 86 -> 0 bytes .../60/91d709b275e712111d016d9b3a4fb44e63f1f6 | Bin 54 -> 0 bytes .../61/01e935461d4cd862ae4a720846e87880d198b9 | Bin 66 -> 0 bytes .../68/7ff9526e0d56fafe1445ee4c182a83afc3cc35 | Bin 155 -> 0 bytes .../6d/fbfa4bd19cb38608681df40ebb3a78bd13a824 | 3 - .../78/3666de4acbb22a9efc205197667f5136118c54 | Bin 328 -> 0 bytes .../7b/c178be031c4645110e9accb4accf16902d2d7f | Bin 158 -> 0 bytes .../82/db6d0e4502f489719ea0f3dbe7e14413c6d28a | 3 - .../88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d | Bin 66 -> 0 bytes .../88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 | Bin 65 -> 0 bytes .../8c/d762c119834784fdbf97e9bb3b4c15e804ebaa | Bin 147 -> 0 bytes .../90/a84fd62f8033027fab3e567a81d5ed2a6a71cd | Bin 66 -> 0 bytes .../91/65a12a95d3b2b9b8a0374de787af169b2c339e | Bin 48 -> 0 bytes .../95/9d7a10da71acf97b17300b40a3b4f30903e09c | Bin 358 -> 0 bytes .../9d/e8260b738a34a74533df54f2e404276aa96242 | Bin 54 -> 0 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../af/a76754c933269d7cd45630a7184a20849dbe9c | Bin 66 -> 0 bytes .../b4/121e2d6aa156227b6541431ddfb8594904b520 | Bin 66 -> 0 bytes .../c1/dd146476a4a37fff75b88612a718281ea83b58 | Bin 277 -> 0 bytes .../c2/7ef6b4964209a875191eca7e56605c8efa5eee | Bin 154 -> 0 bytes .../c5/0f7e1375a30118c2886d4b31318579f3419231 | Bin 154 -> 0 bytes .../c9/b473bec307b18fd94a913658f4d759be63ca47 | Bin 156 -> 0 bytes .../ce/d01df5f1a270490c1b9d4efe5ceb0c53626279 | 2 - .../d0/60f7226715ca55b04e91fad2b8aca01badd993 | Bin 303 -> 0 bytes .../d2/5721fffa7dc911ff2a9102bef201db225e2f16 | Bin 166 -> 0 bytes .../d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 | Bin 201 -> 0 bytes .../da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 | Bin 227 -> 0 bytes .../db/f5ab9a4fa3f976d266f3be50670aa83121b420 | 3 - .../dc/d348507ba1da8f6479b9d964daa302b2fb9d9c | 1 - .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 21 -> 0 bytes .../e3/ae5c6d8407e8307b9bc77923be78c901408f6e | Bin 50 -> 0 bytes .../e4/48ae5bf6371d80ebee24a22b6df341797a6511 | Bin 66 -> 0 bytes .../e4/666ba294866d5c16f9afebcacf8f4adfee7439 | Bin 86 -> 0 bytes .../ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d | Bin 361 -> 0 bytes .../eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 | Bin 66 -> 0 bytes .../f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 | Bin 144 -> 0 bytes .../f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 | Bin 54 -> 0 bytes .../fd/31cea7e0b6e8d334280be34db8dd86cdda3007 | Bin 352 -> 0 bytes .../repo/.git_keep/refs/heads/base_branch | 1 - .../repo/.git_keep/refs/heads/develop | 1 - .../refs/heads/feature/cherry-picking | 1 - .../expected/repo/.git_keep/refs/heads/master | 1 - .../repo/.git_keep/refs/heads/other_branch | 1 - .../expected/repo/cherrypicking1 | 1 - .../expected/repo/cherrypicking2 | 1 - .../expected/repo/cherrypicking3 | 1 - .../expected/repo/cherrypicking4 | 1 - .../expected/repo/cherrypicking5 | 1 - .../expected/repo/cherrypicking6 | 1 - .../expected/repo/cherrypicking7 | 1 - .../expected/repo/cherrypicking8 | 1 - .../expected/repo/cherrypicking9 | 1 - .../expected/repo/directory/file | 5 - .../expected/repo/directory/file2 | 5 - .../mergeConflictUndo/expected/repo/file | 1 - .../mergeConflictUndo/expected/repo/file1 | 63 ------- .../mergeConflictUndo/expected/repo/file3 | 5 - .../mergeConflictUndo/expected/repo/file4 | 5 - .../mergeConflictUndo/expected/repo/file5 | 5 - .../mergeConflictUndo/recording.json | 1 - test/integration/mergeConflictUndo/setup.sh | 158 ------------------ test/integration/mergeConflictUndo/test.json | 1 - 111 files changed, 123 insertions(+), 376 deletions(-) create mode 100644 pkg/integration/tests/conflicts/undo_choose_hunk.go delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/MERGE_HEAD delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/MERGE_MODE delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/MERGE_MSG delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/ORIG_HEAD delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/config delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/description delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/index delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/base_branch delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/develop delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/feature/cherry-picking delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/logs/refs/heads/other_branch delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/08/e2576bb7cd0dd9be54f9a523c4bedea0643557 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/17/dc45dd142947e06cf7e635d62f2c0acbb86da7 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/18/c07ac9568c564ececb199f78f64babc92214cb delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/24/10ee12b940bade9d9e99413732faa6dc60adb1 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/27/94411aa7b73b44f533fb862cdb9dbfd13c5d92 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/27/9f068805e089660f7ddd17ff32f66100e0dca5 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/31/f2a971f823279ba1ef877be7599da288f6e24b delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/32/d15fd4451b6693a93d6420c8af6cfc99348e71 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/3d/1213374cd86b841f034768571d0b5f2c870a16 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/44/2a53c1b023b4816085fdc4eaa85d0c5fd897e2 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/4e/5d3ae0b6e865073bcbd79531a75c55bf7bfcb4 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/5d/874a902548f753e50944827e572a7470aa9731 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/5d/a4d9200457542d875fe4def54ac98c16332db0 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/5d/c2e019349371e9b3e4f1be99754ba70094cad6 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/68/7ff9526e0d56fafe1445ee4c182a83afc3cc35 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/6d/fbfa4bd19cb38608681df40ebb3a78bd13a824 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/7b/c178be031c4645110e9accb4accf16902d2d7f delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/82/db6d0e4502f489719ea0f3dbe7e14413c6d28a delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/8c/d762c119834784fdbf97e9bb3b4c15e804ebaa delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/91/65a12a95d3b2b9b8a0374de787af169b2c339e delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/c2/7ef6b4964209a875191eca7e56605c8efa5eee delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/c5/0f7e1375a30118c2886d4b31318579f3419231 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/c9/b473bec307b18fd94a913658f4d759be63ca47 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/ce/d01df5f1a270490c1b9d4efe5ceb0c53626279 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/d2/5721fffa7dc911ff2a9102bef201db225e2f16 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/db/f5ab9a4fa3f976d266f3be50670aa83121b420 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/base_branch delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/develop delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/feature/cherry-picking delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/mergeConflictUndo/expected/repo/.git_keep/refs/heads/other_branch delete mode 100644 test/integration/mergeConflictUndo/expected/repo/cherrypicking1 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/cherrypicking2 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/cherrypicking3 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/cherrypicking4 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/cherrypicking5 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/cherrypicking6 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/cherrypicking7 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/cherrypicking8 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/cherrypicking9 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/directory/file delete mode 100644 test/integration/mergeConflictUndo/expected/repo/directory/file2 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/file delete mode 100644 test/integration/mergeConflictUndo/expected/repo/file1 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/file3 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/file4 delete mode 100644 test/integration/mergeConflictUndo/expected/repo/file5 delete mode 100644 test/integration/mergeConflictUndo/recording.json delete mode 100644 test/integration/mergeConflictUndo/setup.sh delete mode 100644 test/integration/mergeConflictUndo/test.json 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 42f7d29fe1039a698e682836b6cca2aa4a95985b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2118 zcmZ?q402{*U|<4b@r3NHoNCqEIbbv+0|N`2E`K2dL*o(#2F9;IH6lQ4lF0bd)J@js zM$$U3A`Z6~6%7|>>}23e&PXjPsw~J%&d$tBHw3C<0Gm_yG73gR%_~ATuVXg<{imPS z+17q$%eOxGu<=)+PA{5yMsV{QU#o!41JY3QiqXw`J>kXmjphq)Oldf|N&kZ3%vp?@$GYfm=CTd1->EFp&i(9IS(Pe? zW}Z3Ryb03#z~%vIsCgCW=1o}Pe@(x^n5llXU07A))wfz%g=f*svw)j7>GNH%c|aO! zUM0GDN*n$*)Lwm}ap;D`x^IgNWoraqw4#}32{I2i0HtRHSi0x&U)9tbUm`-Ic=DYt z1bDS{Ulrg>$t+4uF3B&d)KAOINkyo}#zHmkem1Z6nX+eZ_)jSuQWx;@*VuJLT7d%d zBzS%pH7M;n_j1*u@T&fnSK9L})D0*w537IqQT+?faM-*G79+yH6qtwAzgWxzrV}>B zIXdTIG&H@0p`{mT6@hm`I~{i2n>%l&qq)(qWp@(RZe(CV#41ofpWqZ3e;5rlrxn#4 z#+=x8uL-Ii--DlWx-`{=Yn2qNnr_Iz3Ni;=+~Eu@h&c%9$LnHpTi9P1RL?$Msl2b^ zB%?!ro&wk$aIu6?h`~Y)cj;MAzuy05xNDUJm%;j*Gwhr1sGl+*!yMf10T*i+u0RM7 z>mJg~!R;P!v52r9gGH=+Am)Swxw-<45M|IcR50X%r+*OFfGfx~6j(7b3PPgS(7?dV z#DoEr>Nq^-j^@d!KOQc#IqUI!_qCfjJ9gZ;>=97C@K%3H<<6Taw-z&P`aO4!f5RJ| zYR-4BBY1fvr<9Z*&_2p%OKq*6zMi4Tep+9v%&M6?43KKzNTmw LiY`sb@QDBbJ2Xdq 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 4fd3d95f4c568b9122d51e5a638682282500148f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 146 zcmV;D0B!$x0gaA93d0}}0DJZo-V0?l(cOho3OVH&#$9P3HX&H(^Xn6O9cEziUhCSd zV|Qt%s`Wr2lL#aN<)FfWb(F=Yg{j22FhUYUbEH$>&3fblkqCkUag0z!hf_^vwu z1<5Ix^l7jCw9{i0cyw`_y(P2b44q&f60MluoYWk;c%DSof0Ur}N4s8!c AYXATM 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 8d42c4c9e2f8c317030a30193aef9945f0c8afa2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 112 zcmV-$0FVE80V^p=O;s>7Fk&z<00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^R6~Y4mpuZi7vAbmsoZ%p<PK~iAM@OWKJZVUShgX-DG SE0y;F6gC_H 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 25389c9d662fa3c7c7b5b9b2c4a41240d70f394f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 34 qcmbL%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkxQPJ}D5PW-r6!l;7gaJOOuWvysr0#!pe$qVY%BjQe#sxdK}}1`%tRw`G|d zI1HC|h=3#u+6Sy zUz9zwkEXoav>nh7aPNnwe9E%FNW!)Q!&CCiqpb&Mf8& H!T&z+&6r3a 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 f74bf2335bbc5999ad0faff94fb04165d8ab5c7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb~ZE#08nZNMgRZ+ 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 a58cdfd1c390d5973fb705281d1084dfcd9e5d96..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 159 zcmV;Q0AT-k0gaDK3c@fDKwak)*$Xn$nS2T&LRURTn@q6KG^IxI_y)Xy+s9kH7fQ}c z)g8jA9wNG9n;d&5;KdR_2(ttRL*f9DO*E7&M^^iE$X0bQkenbnGf@+K=)AX)XF@`6 zT%U-s?+DfOs*iH$Vbs@Qyvt|G`zn`E@=c>fXB{$uJ|h6AMq5;sKXsLs7VkpVTELH%bw9K4Tg}l<-q|_n>Gli0j#1aKh^<0JY{LH*` Yg_3-Q7nZts^PE0#`Wacbg|_{j0{$> Gd}ROuKoaKw 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 1cafb95f9172da116f05816fbf223f92099aebbf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 144 zcmV;B0B`?z0V^p=O;s>5Fkmn-00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^REF3kHx*dILv-8YpWOTEb+SjySa$=GydlG#%N_yM3vczORPMZ) ya%(Zurr&etASp0rc)Ttqw}t(MLG|q8mCE}nPBJ?5=OHODA*8?*s{#O;Tv8UZnMM@= 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 27c11bb26067e0a43b68d14777da3f61ddfcceac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 117 zcmV-*0E+*30V^p=O;s>7Hf1m|00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^R6~Y4mpuZi7vAbmsoZ%p<PK~iAM@OWKJZVUShgX-DG XE0yi+kh=VyFxv@AV 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 99177464395aa927a36557643ce3e4e536679578..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>ONEk*#1aKh^<0JY{LH*` Yg_3-Q4F=sF|FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMDu~m6i-j8~!%bUVWl*=!V3)Z;K3N zYXo1kniv3qLP};)YH~?_Q65Fkmn-00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^R0b7+cS1WIcHNshZ>FQU(XVB964q`+k~d_ybJ-)Hdf~19l**kq zQ*JG0+Vp$w93%zC43F2v7HD)k0FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^Z_#002M^ExDCi(6FlVrV00j?MM;EUAyyR4c(t`Xvg+zst%-mFkl8n@%RE6@y mVxT}qeo=8Mmn{U~SDKq&3RG$b0SYOpWvMy&1zZ3SiX=>?Kq37A diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd deleted file mode 100644 index e8d63bced5a790cf612ba77d98cf03e888d91233..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 120 zcmV-;0Ehp00V^p=O;s>7vtTeW00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^R6~Y4mpuZi7vAbmsoZ%p<PK~iAM@OWKJZVUShgX-DG aE0y9GGs6`FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_7jvWBSN{0B< C>3I79 diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 deleted file mode 100644 index 74bc806ad..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 +++ /dev/null @@ -1,2 +0,0 @@ -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/repo/.git_keep/objects/3d/1213374cd86b841f034768571d0b5f2c870a16 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/3d/1213374cd86b841f034768571d0b5f2c870a16 deleted file mode 100644 index 7fafc3d92c64b6e4942abbc24ad93ebcded0baec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 161 zcmV;S0ABxi0gaALYC|y$2D|ntv@aA(cKrjT6tc=OWWP@&Q0E25h2-`P^a9-uGcbK0 zUdS&mud(!9B!asFq=XqQ7SCLKJ PPD3yBfKK-dupmQ8?uAU3 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 (4Gq}dp9<87~X|IUedoJJteuO~6%SXa40pmOk z3s=V0KxiuUhGtS^Y6#2)Dtol3O3%rhL5Z7_vNHN9#VFklej8i4j3TV0&U^nWeH~Kd NeFssJdjPfiP{E>uGQ4g3%pYvzD&lvWcY&Pr_@JZHVP-@|e008rm4L|?@ diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/5d/c2e019349371e9b3e4f1be99754ba70094cad6 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/5d/c2e019349371e9b3e4f1be99754ba70094cad6 deleted file mode 100644 index 66cca675c..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/5d/c2e019349371e9b3e4f1be99754ba70094cad6 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0E]d&D<$PR x/-^]D #aƐ.s]88rbԑsaP+oroB%G.R؉g Y\כROIgFDij\=[fy,?w \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 deleted file mode 100644 index 27ac61738744e4923b0d928f7521dd5707074712..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 86 zcmV-c0IC0Y0V^p=O;s?nWH2!R0)>>!qSWM){Gv*R&)<{QyJ)WK{KdP@mMc1dXQ7zE s5kmt5GZPbqw9K4TLxww-Jp!s1-s(@O+<7zQ)?%hjzvs>Y05^djO6CqI%>V!Z diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 deleted file mode 100644 index bfb5376c67ba79deb64b9463958ebd99b0ed9f64..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54 zcmV-60LlM&0V^p=O;s>6WiT`_Ff%bxNXyJgWmvlB@n6-{8($(qqj>V2E(CbBbYDf1 MH^Qm_0Pdw7o*~;6`~Uy| diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9 deleted file mode 100644 index 236b6cdf4f4a62168a2e0b0b9b49cdcdbc22c808..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>Lxqxz#1aKh^<0JY{LH*` Yg_3-QZ^Jfvdf*ePpBUKJ6Elb)w~`coIV9<8tPmz`5L J@dfdm diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/6d/fbfa4bd19cb38608681df40ebb3a78bd13a824 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/6d/fbfa4bd19cb38608681df40ebb3a78bd13a824 deleted file mode 100644 index f43fa73ed..000000000 --- a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/6d/fbfa4bd19cb38608681df40ebb3a78bd13a824 +++ /dev/null @@ -1,3 +0,0 @@ -xM -0F]dI3DzLh1%DoxXKY; D.'L8k``FZE&"5jƚ9&u8!qV՗`6or܁,e2Lz -e8@N \ No newline at end of file diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 deleted file mode 100644 index c41ae5c621a9bf45b6c82cc55ae9068918c3caa0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 328 zcmV-O0k{5m0V^p=O;s>4F=sF|FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMDu~m6i-j8~!%bUVWl*=!V3)Z;K3N zYXo1kniv3qLP};)YH~?_Q6)pd#Os`!N}me}$};B8w({TNm;CV?)U>qBoK!=Gj>B{A aXr7$<7VkpVTELH%bw9K4Tg}l<-q|_n>BZZQT#1aKh^<0JY{LH*` Yg_3-Q4S%^SLg|yFpm%oy_5Q@LNrc#=mehd019~do((@nIYt_` BMEw8& diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd deleted file mode 100644 index cdd5f8a937e758f7ae915812f83d48cfa5d7ef50..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>3x$%5#1aKh^<0JY{LH*` Yg_3-Q8G-fa~FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMDu~m6i-j8~!%bUVWl*=!V3)Z;K3N zYXo1kniv3qLP};)YH~?_Q6Zgztm|#@^04{ye Es|G`_Y5)KL diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 deleted file mode 100644 index ffc277c86c56c088175e46f1590082f30deb89cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54 zcmV-60LlM&0V^p=O;s>6WiT`_Ff%bxNXyJgWsu`~^A08nuUMF0Q* diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c deleted file mode 100644 index 7302ca34e9d34bcda37b5a408f6b509933d555f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>Q-zX@#1aKh^<0JY{LH*` Yg_3-Q7VkpVTELH%bw9K4Tg}l<-q|_n>6NQqD#1aKh^<0JY{LH*` Yg_3-Qb%7 diff --git a/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 b/test/integration/mergeConflictUndo/expected/repo/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 deleted file mode 100644 index 008bb1a6567766c154b88180e8aa85b15392362c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 277 zcmV+w0qXvE0V^p=O;s>9GiER}FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_7i&B$I@{1}N5++{f+*JBpNKlqBcea)P7Qf_=-=LGp0gaA93c@fD06pgwdlw{|Cc6Gp0gaA93c@fD06pgwdlzIk*=!7m2tD-~NxHQKYf6de^DX!Rufq&Xsmn4q zu*iqDsX{nA5gC+I$=TWzbu1P=#UK(!Pfm!=#j{z{rq2d`C{~f8 zhSTWGAj$byoIw?ox7K)14J#wv9=D=4A*JC^C#B*!I#wP4akzSjkѦ>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 ab357ec23a607497ddef075b5880fd9579922e8d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 303 zcmV+~0nq+<0V^p=O;s>4Fl8__FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMIIe0T3vpWEQ0+m*f{!G9*mA&bg`d zxsaeNWA1D#|1EyWAHP9OOUukjHDu^GJm-$)$*DgcF0(o7@qG8Sn>jmn003Pvs7;ya BlW+h4 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 035d7ebefa5f4760d14464c4aee16160a6970cfd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 166 zcmV;X09pTd0gaA9YQr!P0DIOe_Ff3P(poD)DTSQ;jJ32PfjTy}LYv>mkPqZK%)pdo zp06D|$w%MJfP^)b%*>^!AjagYFb=uqrg^eKID7WRt-9H*L#X5_1mRLsoDx&Rz!K9S zRB;-bFG)}-I=%PHvcY+Tuk-k0|2nU~b}GyK4HQYD5C?=$LPU4aW2)Pmy4$TRw+gQe U_WSgw4>0Y}Hrp@m366z9cnq6VZvX%Q 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 198bff1ec786820e0c2f41db6e2bed90f1e103fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 201 zcmV;)05<=40V^p=O;s>5HfJz2FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRl&pn2ozE>i&B$I@{1}N5++{f z+*JBpNKlqBcea)P7Qf_=-=L5w`4FhFfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GxD20);Yl3A3RT#{c@$&fJdI_IX+=R$(AjJdO|{I~cefBXhDEiE%A)sUg% d@SHoEC#U{+xXk9P$MfCSZszRR0RVyibtbb-a`^xN 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 9b771fc2f6f41f91b00976b4ff3f8f9935f7931e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb>`CU&08otwO#lD@ 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 3a7ee91eab601eb205b04a6e1e62c58599193222..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmb7nZts^PE0#+C9!Ty%L6BZHMO GUmgJUj1jT` 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 714e20cb7eb8a76c9832939c1e2a103d78bb257d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>bA^(O#1aKh^<0JY{LH*` Yg_3-Q>!qSWM){Gv*Rgo)QVH8F=H?^FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMDu~m6i-j8~!%bUVWl*=!V3)Z;K3N zYXo1kniv3qLP};)YH~?_Q6Zgztm=IE6id6vs H4=>-(3qr6K 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 4992422c7407bf6efc09d23127726c19cec1119d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 66 zcmV-I0KNZs0ZYosPf{>7VkpVTELH%bw9K4Tg}l<-q|_n>V}+88#1aKh^<0JY{LH*` Yg_3-Q5Fkmn-00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^R0eS?hqn=r4HCq1PXDguIm6t(FP;-g-jLzWWsiXBg}3@sDtF#Y yxwV*S)9<-+kQ5j*JYE-*+rs|BpnCT4O67eOCm9|3^N@@RRI7%&rx)LLPgyG 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 e9f9f0881a1460f9b019818b1cbd6e4f67fe70aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54 zcmV-60LlM&0V^p=O;s>6WiT`_Ff%bxNXyJgWw@Wst9_>I*&F^-3WwAMy!L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMDu~m6i-j8~!%bUVWl*=!V3)Z;K3N zYXo1kniv3qLP};)YH~?_Q6ZbrQLc@`W;jN4S 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 }