summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2023-02-25 22:09:14 +1100
committerJesse Duffield <jessedduffield@gmail.com>2023-02-26 11:22:24 +1100
commitff3c5d331ecaaa5a9f372deda8877a92331dde7f (patch)
tree6aa51c4c070ddf01d1b37f34c1e0cb6928f10ccf
parent33f9f81c8c83f33ef75ef5cd9dee7b842af07e64 (diff)
migrate merge conflict tests
Diffstat
-rw-r--r--pkg/integration/tests/conflicts/filter.go38
-rw-r--r--pkg/integration/tests/conflicts/resolve_externally.go33
-rw-r--r--pkg/integration/tests/conflicts/resolve_multiple_files.go54
-rw-r--r--pkg/integration/tests/shared/conflicts.go40
-rw-r--r--pkg/integration/tests/tests_gen.go3
-rw-r--r--test/integration/mergeConflicts/config/config.yml5
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/COMMIT_EDITMSG36
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/FETCH_HEAD0
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/HEAD1
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/ORIG_HEAD1
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/config10
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/description1
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/indexbin1814 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/info/exclude7
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/logs/HEAD34
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/base_branch3
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/develop5
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/feature/cherry-picking9
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/master5
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/other_branch3
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585dbin112 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/0b/2387a3f67ec050f6d4e08f379e3cbb0a9913f1bin148 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/16/18ce1085acb41fd710e279ac38911aadfb0a09bin121 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09bin34 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242cbin177 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827bin21 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7bin66 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27cabin50 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/1f/bc3eb4b11cb89b204a593572c2e01462ca5a894
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77bin144 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4afbin117 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885bin66 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/24/10ee12b940bade9d9e99413732faa6dc60adb1bin34 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4bin327 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/27/94411aa7b73b44f533fb862cdb9dbfd13c5d92bin145 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8bin150 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/32/d15fd4451b6693a93d6420c8af6cfc99348e71bin80 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/34/1cf8213827614a274c750cd7dec4307eb41de7bin153 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcdbin120 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8cbin252 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf618002
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/49/7b1e236588f0e2674c9a5787abeb226abf3680bin407 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c251
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/55/9043765dc6c32c943b6278b4abbff1e6f528393
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/55/f688e6b47b7a5ca8ffc4e25b77c1af6222b5036
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/56/2af0640203fb5a6e92c090d8d1ded26806d2c4bin147 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/5d/874a902548f753e50944827e572a7470aa9731bin107 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/5d/a4d9200457542d875fe4def54ac98c16332db0bin33 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3bin86 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6bin54 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9bin66 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/61/db24350a92fa37b2fe35f13eb3dd3f7655f6cf2
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54bin328 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8dbin66 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8bin65 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cdbin66 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/91/65a12a95d3b2b9b8a0374de787af169b2c339ebin48 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09cbin358 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242bin54 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/a1/9ec0b99e516795f349033f09383f87be0b74e92
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/a1/e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b4
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5bin21 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9cbin66 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/b0/753bdba91b84e3f406e21dbc7deba8e98f1fc8bin153 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/b2/d5312a06a9c56e9ada21c48a12f57ce8dd4c4a3
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520bin66 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58bin277 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/cc/19bee93215b6c20ab129fb2c006762d4ae1497bin155 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993bin303 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/d3/e2708327280097b5e1f8ab69309934b24f8b643
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4bin201 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0bin227 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c1
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/dd/259e90c3748e269bdf1ee3ce537a006d2394aa3
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/df/2c0daa40dcba0dded361a25ff7806b13db59a6bin154 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41bbin21 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6ebin50 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511bin66 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439bin86 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/e5/63585cb87cc39b553ca421902d631ea88901182
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3dbin361 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7bin66 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/ed/d4e2e50eb82125428b045c540a9194d934e180bin154 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2bin144 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4bin54 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/f7/f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5ebin163 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/f8/9097f0bd23eda6d8977c0edfae7f913ffc5db3bin158 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/f8/dd12b796f400be7f59d9471670c3080f9c90a11
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007bin352 -> 0 bytes
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/base_branch1
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/develop1
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/feature/cherry-picking1
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/master1
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/other_branch1
-rw-r--r--test/integration/mergeConflicts/expected/repo/cherrypicking11
-rw-r--r--test/integration/mergeConflicts/expected/repo/cherrypicking21
-rw-r--r--test/integration/mergeConflicts/expected/repo/cherrypicking31
-rw-r--r--test/integration/mergeConflicts/expected/repo/cherrypicking41
-rw-r--r--test/integration/mergeConflicts/expected/repo/cherrypicking51
-rw-r--r--test/integration/mergeConflicts/expected/repo/cherrypicking61
-rw-r--r--test/integration/mergeConflicts/expected/repo/cherrypicking71
-rw-r--r--test/integration/mergeConflicts/expected/repo/cherrypicking81
-rw-r--r--test/integration/mergeConflicts/expected/repo/cherrypicking91
-rw-r--r--test/integration/mergeConflicts/expected/repo/directory/file1
-rw-r--r--test/integration/mergeConflicts/expected/repo/directory/file21
-rw-r--r--test/integration/mergeConflicts/expected/repo/file1
-rw-r--r--test/integration/mergeConflicts/expected/repo/file163
-rw-r--r--test/integration/mergeConflicts/expected/repo/file31
-rw-r--r--test/integration/mergeConflicts/expected/repo/file41
-rw-r--r--test/integration/mergeConflicts/expected/repo/file51
-rw-r--r--test/integration/mergeConflicts/recording.json1
-rw-r--r--test/integration/mergeConflicts/setup.sh158
-rw-r--r--test/integration/mergeConflicts/test.json1
-rw-r--r--test/integration/mergeConflictsFiltered/config/config.yml5
-rw-r--r--test/integration/mergeConflictsFiltered/expected/repo/.git_keep/COMMIT_EDITMSG38
-rw-r--r--test/integration/mergeConflictsFiltered/expected/repo/.git_keep/FETCH_HEAD0
-rw-r--r--test/integration/mergeConflictsFiltered/expected/repo/.git_keep/HEAD1
-rw-r--r--test/integration/mergeConflictsFiltered/expected/repo/.git_keep/ORIG_HEAD1
-rw-r--r--test/integration/mergeConflictsFiltered/expected/repo/.git_keep/config10
-rw-r--r--test/integration/mergeConflictsFiltered/expected/repo/.git_keep/description1
-rw-r--r--test/integration/mergeConflictsFiltered/expected/repo/.git_keep/indexbin1734 -> 0 bytes
-rw-r--r--test/integration/mergeConflictsFiltered/expected/repo/.git_keep/info/exclude7
-rw-r--r--test/integration/mergeConflictsFiltered/expe