mercurial: tests/test-merge-changedelete.t@8abd9f785030 (annotated)

27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1	Tests for change/delete conflicts, including:
12328 b63f6422d2a7 tests: fix a bunch of pointless #s in unified tests Matt Mackall <mpm@selenic.com> parents: 12259 diff changeset	2	b5605d88dc27: Make ui.prompt repeat on "unrecognized response" again
b63f6422d2a7 tests: fix a bunch of pointless #s in unified tests Matt Mackall <mpm@selenic.com> parents: 12259 diff changeset	3	(issue897)
b63f6422d2a7 tests: fix a bunch of pointless #s in unified tests Matt Mackall <mpm@selenic.com> parents: 12259 diff changeset	4
b63f6422d2a7 tests: fix a bunch of pointless #s in unified tests Matt Mackall <mpm@selenic.com> parents: 12259 diff changeset	5	840e2b315c1f: Fix misleading error and prompts during update/merge
b63f6422d2a7 tests: fix a bunch of pointless #s in unified tests Matt Mackall <mpm@selenic.com> parents: 12259 diff changeset	6	(issue556)
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	7
26895 fc41f9ffd4a4 test-merge-prompt.t: unset HGMERGE Siddharth Agarwal <sid0@fb.com> parents: 26850 diff changeset	8	Make sure HGMERGE doesn't interfere with the test
fc41f9ffd4a4 test-merge-prompt.t: unset HGMERGE Siddharth Agarwal <sid0@fb.com> parents: 26850 diff changeset	9	$ unset HGMERGE
fc41f9ffd4a4 test-merge-prompt.t: unset HGMERGE Siddharth Agarwal <sid0@fb.com> parents: 26850 diff changeset	10
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	11	$ status() {
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	12	> echo "--- status ---"
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	13	> hg st -A file1 file2 file3
27126 72b4e1bf8f28 test-merge-changedelete.t: add resolve --list output Siddharth Agarwal <sid0@fb.com> parents: 27125 diff changeset	14	> echo "--- resolve --list ---"
72b4e1bf8f28 test-merge-changedelete.t: add resolve --list output Siddharth Agarwal <sid0@fb.com> parents: 27125 diff changeset	15	> hg resolve --list file1 file2 file3
27136 29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	16	> echo "--- debugmergestate ---"
29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	17	> hg debugmergestate
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	18	> for file in file1 file2 file3; do
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	19	> if [ -f $file ]; then
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	20	> echo "--- $file ---"
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	21	> cat $file
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	22	> else
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	23	> echo "*** $file does not exist"
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	24	> fi
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	25	> done
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	26	> }
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	27
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	28	$ hg init repo
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	29	$ cd repo
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	30
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	31	$ echo 1 > file1
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	32	$ echo 2 > file2
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	33	$ echo 3 > file3
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	34	$ hg ci -Am 'added files'
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	35	adding file1
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	36	adding file2
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	37	adding file3
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	38
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	39	$ hg rm file1
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	40	$ echo changed >> file2
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	41	$ echo changed1 >> file3
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	42	$ hg ci -m 'removed file1, changed file2, changed file3'
5672 8a65ea986755 Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge) Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	43
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	44	$ hg co 0
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	45	3 files updated, 0 files merged, 0 files removed, 0 files unresolved
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	46
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	47	$ echo changed >> file1
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	48	$ hg rm file2
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	49	$ echo changed2 >> file3
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	50	$ hg ci -m 'changed file1, removed file2, changed file3'
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	51	created new head
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	52
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	53
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	54	Non-interactive merge:
5672 8a65ea986755 Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge) Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	55
12365 22f3353bcc36 tests: cleanup exit code handling in unified tests Matt Mackall <mpm@selenic.com> parents: 12328 diff changeset	56	$ hg merge -y
18543 c8ba98bf0e71 merge: don't indent "local changed %s which remote deleted" prompt Mads Kiilerich <madski@unity3d.com> parents: 15521 diff changeset	57	local changed file1 which remote deleted
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	58	use (c)hanged version, (d)elete, or leave (u)nresolved? u
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	59	remote changed file2 which local deleted
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	60	use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	61	merging file3
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	62	warning: conflicts while merging file3! (edit, then use 'hg resolve --mark')
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	63	0 files updated, 0 files merged, 0 files removed, 3 files unresolved
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	64	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	65	[1]
5672 8a65ea986755 Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge) Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	66
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	67	$ status
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	68	--- status ---
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	69	M file2
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	70	M file3
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	71	C file1
27126 72b4e1bf8f28 test-merge-changedelete.t: add resolve --list output Siddharth Agarwal <sid0@fb.com> parents: 27125 diff changeset	72	--- resolve --list ---
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	73	U file1
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	74	U file2
27126 72b4e1bf8f28 test-merge-changedelete.t: add resolve --list output Siddharth Agarwal <sid0@fb.com> parents: 27125 diff changeset	75	U file3
27136 29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	76	--- debugmergestate ---
29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	77	* version 2 records
29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	78	local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	79	other: 10f9a0a634e82080907e62f075ab119cbc565ea6
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	80	file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	81	file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	82	local path: file1 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	83	ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	84	other path: file1 (node null)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	85	file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	86	file: file2 (record type "C", state "u", hash null)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	87	local path: file2 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	88	ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	89	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	90	file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27136 29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	91	file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11)
29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	92	local path: file3 (flags "")
29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	93	ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	94	other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	95	--- file1 ---
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	96	1
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	97	changed
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	98	--- file2 ---
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	99	2
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	100	changed
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	101	--- file3 ---
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	102	3
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	103	<<<<<<< local: 13910f48cf7b - test: changed file1, removed file2, changed file3
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	104	changed2
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	105	=======
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	106	changed1
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	107	>>>>>>> other: 10f9a0a634e8 - test: removed file1, changed file2, changed file3
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	108
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	109
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	110	Interactive merge:
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	111
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	112	$ hg co -C
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	113	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
5672 8a65ea986755 Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge) Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	114
12365 22f3353bcc36 tests: cleanup exit code handling in unified tests Matt Mackall <mpm@selenic.com> parents: 12328 diff changeset	115	$ hg merge --config ui.interactive=true <<EOF
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	116	> c
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	117	> d
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	118	> EOF
18543 c8ba98bf0e71 merge: don't indent "local changed %s which remote deleted" prompt Mads Kiilerich <madski@unity3d.com> parents: 15521 diff changeset	119	local changed file1 which remote deleted
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	120	use (c)hanged version, (d)elete, or leave (u)nresolved? c
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	121	remote changed file2 which local deleted
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	122	use (c)hanged version, leave (d)eleted, or leave (u)nresolved? d
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	123	merging file3
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	124	warning: conflicts while merging file3! (edit, then use 'hg resolve --mark')
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	125	0 files updated, 2 files merged, 0 files removed, 1 files unresolved
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	126	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	127	[1]
5672 8a65ea986755 Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge) Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	128
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	129	$ status
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	130	--- status ---
15521 117f9190c1ba tests: hide 'No such file or directory' messages Mads Kiilerich <mads@kiilerich.com> parents: 12365 diff changeset	131	file2: * (glob)
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	132	M file3
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	133	C file1
27126 72b4e1bf8f28 test-merge-changedelete.t: add resolve --list output Siddharth Agarwal <sid0@fb.com> parents: 27125 diff changeset	134	--- resolve --list ---
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	135	R file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	136	R file2
27126 72b4e1bf8f28 test-merge-changedelete.t: add resolve --list output Siddharth Agarwal <sid0@fb.com> parents: 27125 diff changeset	137	U file3
27136 29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	138	--- debugmergestate ---
29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	139	* version 2 records
29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	140	local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	141	other: 10f9a0a634e82080907e62f075ab119cbc565ea6
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	142	file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	143	file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	144	local path: file1 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	145	ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	146	other path: file1 (node null)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	147	file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	148	file: file2 (record type "C", state "r", hash null)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	149	local path: file2 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	150	ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	151	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	152	file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27136 29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	153	file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11)
29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	154	local path: file3 (flags "")
29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	155	ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	156	other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	157	--- file1 ---
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	158	1
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	159	changed
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	160	*** file2 does not exist
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	161	--- file3 ---
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	162	3
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	163	<<<<<<< local: 13910f48cf7b - test: changed file1, removed file2, changed file3
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	164	changed2
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	165	=======
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	166	changed1
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	167	>>>>>>> other: 10f9a0a634e8 - test: removed file1, changed file2, changed file3
5672 8a65ea986755 Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge) Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	168
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	169
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	170	Interactive merge with bad input:
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	171
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	172	$ hg co -C
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	173	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5672 8a65ea986755 Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge) Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	174
12365 22f3353bcc36 tests: cleanup exit code handling in unified tests Matt Mackall <mpm@selenic.com> parents: 12328 diff changeset	175	$ hg merge --config ui.interactive=true <<EOF
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	176	> foo
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	177	> bar
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	178	> d
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	179	> baz
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	180	> c
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	181	> EOF
18543 c8ba98bf0e71 merge: don't indent "local changed %s which remote deleted" prompt Mads Kiilerich <madski@unity3d.com> parents: 15521 diff changeset	182	local changed file1 which remote deleted
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	183	use (c)hanged version, (d)elete, or leave (u)nresolved? foo
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	184	unrecognized response
18543 c8ba98bf0e71 merge: don't indent "local changed %s which remote deleted" prompt Mads Kiilerich <madski@unity3d.com> parents: 15521 diff changeset	185	local changed file1 which remote deleted
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	186	use (c)hanged version, (d)elete, or leave (u)nresolved? bar
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	187	unrecognized response
18543 c8ba98bf0e71 merge: don't indent "local changed %s which remote deleted" prompt Mads Kiilerich <madski@unity3d.com> parents: 15521 diff changeset	188	local changed file1 which remote deleted
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	189	use (c)hanged version, (d)elete, or leave (u)nresolved? d
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	190	remote changed file2 which local deleted
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	191	use (c)hanged version, leave (d)eleted, or leave (u)nresolved? baz
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	192	unrecognized response
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	193	remote changed file2 which local deleted
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	194	use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	195	merging file3
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	196	warning: conflicts while merging file3! (edit, then use 'hg resolve --mark')
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	197	0 files updated, 1 files merged, 1 files removed, 1 files unresolved
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	198	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	199	[1]
5672 8a65ea986755 Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge) Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	200
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	201	$ status
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	202	--- status ---
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	203	M file2
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	204	M file3
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	205	R file1
27126 72b4e1bf8f28 test-merge-changedelete.t: add resolve --list output Siddharth Agarwal <sid0@fb.com> parents: 27125 diff changeset	206	--- resolve --list ---
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	207	R file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	208	R file2
27126 72b4e1bf8f28 test-merge-changedelete.t: add resolve --list output Siddharth Agarwal <sid0@fb.com> parents: 27125 diff changeset	209	U file3
27136 29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	210	--- debugmergestate ---
29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	211	* version 2 records
29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	212	local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	213	other: 10f9a0a634e82080907e62f075ab119cbc565ea6
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	214	file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	215	file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	216	local path: file1 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	217	ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	218	other path: file1 (node null)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	219	file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	220	file: file2 (record type "C", state "r", hash null)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	221	local path: file2 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	222	ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	223	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	224	file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27136 29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	225	file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11)
29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	226	local path: file3 (flags "")
29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	227	ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	228	other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	229	*** file1 does not exist
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	230	--- file2 ---
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	231	2
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	232	changed
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	233	--- file3 ---
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	234	3
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	235	<<<<<<< local: 13910f48cf7b - test: changed file1, removed file2, changed file3
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	236	changed2
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	237	=======
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	238	changed1
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	239	>>>>>>> other: 10f9a0a634e8 - test: removed file1, changed file2, changed file3
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	240
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	241
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	242	Interactive merge with not enough input:
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	243
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	244	$ hg co -C
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	245	2 files updated, 0 files merged, 1 files removed, 0 files unresolved
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	246
12365 22f3353bcc36 tests: cleanup exit code handling in unified tests Matt Mackall <mpm@selenic.com> parents: 12328 diff changeset	247	$ hg merge --config ui.interactive=true <<EOF
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	248	> d
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	249	> EOF
18543 c8ba98bf0e71 merge: don't indent "local changed %s which remote deleted" prompt Mads Kiilerich <madski@unity3d.com> parents: 15521 diff changeset	250	local changed file1 which remote deleted
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	251	use (c)hanged version, (d)elete, or leave (u)nresolved? d
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	252	remote changed file2 which local deleted
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	253	use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	254	merging file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	255	warning: conflicts while merging file3! (edit, then use 'hg resolve --mark')
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	256	0 files updated, 0 files merged, 1 files removed, 2 files unresolved
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	257	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	258	[1]
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	259
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	260	$ status
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	261	--- status ---
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	262	M file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	263	M file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	264	R file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	265	--- resolve --list ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	266	R file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	267	U file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	268	U file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	269	--- debugmergestate ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	270	* version 2 records
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	271	local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	272	other: 10f9a0a634e82080907e62f075ab119cbc565ea6
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	273	file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	274	file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	275	local path: file1 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	276	ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	277	other path: file1 (node null)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	278	file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	279	file: file2 (record type "C", state "u", hash null)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	280	local path: file2 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	281	ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	282	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	283	file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	284	file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	285	local path: file3 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	286	ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	287	other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	288	*** file1 does not exist
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	289	--- file2 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	290	2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	291	changed
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	292	--- file3 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	293	3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	294	<<<<<<< local: 13910f48cf7b - test: changed file1, removed file2, changed file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	295	changed2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	296	=======
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	297	changed1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	298	>>>>>>> other: 10f9a0a634e8 - test: removed file1, changed file2, changed file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	299
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	300	Choose local versions of files
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	301
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	302	$ hg co -C
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	303	2 files updated, 0 files merged, 1 files removed, 0 files unresolved
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	304
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	305	$ hg merge --tool :local
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	306	0 files updated, 3 files merged, 0 files removed, 0 files unresolved
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	307	(branch merge, don't forget to commit)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	308	$ status 2>&1 \| tee $TESTTMP/local.status
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	309	--- status ---
15521 117f9190c1ba tests: hide 'No such file or directory' messages Mads Kiilerich <mads@kiilerich.com> parents: 12365 diff changeset	310	file2: * (glob)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	311	M file3
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	312	C file1
27126 72b4e1bf8f28 test-merge-changedelete.t: add resolve --list output Siddharth Agarwal <sid0@fb.com> parents: 27125 diff changeset	313	--- resolve --list ---
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	314	R file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	315	R file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	316	R file3
27136 29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	317	--- debugmergestate ---
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	318	* version 2 records
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	319	local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	320	other: 10f9a0a634e82080907e62f075ab119cbc565ea6
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	321	file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	322	file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	323	local path: file1 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	324	ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	325	other path: file1 (node null)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	326	file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	327	file: file2 (record type "C", state "r", hash null)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	328	local path: file2 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	329	ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	330	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	331	file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	332	file: file3 (record type "F", state "r", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	333	local path: file3 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	334	ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	335	other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	336	--- file1 ---
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	337	1
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	338	changed
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	339	*** file2 does not exist
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	340	--- file3 ---
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	341	3
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	342	changed2
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	343
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	344	Choose other versions of files
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	345
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	346	$ hg co -C
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	347	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	348
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	349	$ hg merge --tool :other
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	350	0 files updated, 2 files merged, 1 files removed, 0 files unresolved
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	351	(branch merge, don't forget to commit)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	352	$ status 2>&1 \| tee $TESTTMP/other.status
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	353	--- status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	354	M file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	355	M file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	356	R file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	357	--- resolve --list ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	358	R file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	359	R file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	360	R file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	361	--- debugmergestate ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	362	* version 2 records
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	363	local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	364	other: 10f9a0a634e82080907e62f075ab119cbc565ea6
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	365	file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	366	file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	367	local path: file1 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	368	ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	369	other path: file1 (node null)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	370	file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	371	file: file2 (record type "C", state "r", hash null)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	372	local path: file2 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	373	ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	374	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	375	file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	376	file: file3 (record type "F", state "r", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	377	local path: file3 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	378	ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	379	other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	380	*** file1 does not exist
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	381	--- file2 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	382	2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	383	changed
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	384	--- file3 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	385	3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	386	changed1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	387
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	388	Fail
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	389
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	390	$ hg co -C
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	391	2 files updated, 0 files merged, 1 files removed, 0 files unresolved
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	392
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	393	$ hg merge --tool :fail
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	394	0 files updated, 0 files merged, 0 files removed, 3 files unresolved
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	395	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	396	[1]
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	397	$ status 2>&1 \| tee $TESTTMP/fail.status
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	398	--- status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	399	M file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	400	M file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	401	C file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	402	--- resolve --list ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	403	U file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	404	U file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	405	U file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	406	--- debugmergestate ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	407	* version 2 records
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	408	local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	409	other: 10f9a0a634e82080907e62f075ab119cbc565ea6
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	410	file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	411	file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	412	local path: file1 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	413	ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	414	other path: file1 (node null)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	415	file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	416	file: file2 (record type "C", state "u", hash null)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	417	local path: file2 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	418	ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	419	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	420	file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	421	file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	422	local path: file3 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	423	ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	424	other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	425	--- file1 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	426	1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	427	changed
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	428	--- file2 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	429	2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	430	changed
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	431	--- file3 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	432	3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	433	changed2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	434
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	435	Force prompts with no input (should be similar to :fail)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	436
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	437	$ hg co -C
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	438	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	439
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	440	$ hg merge --config ui.interactive=True --tool :prompt
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	441	local changed file1 which remote deleted
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	442	use (c)hanged version, (d)elete, or leave (u)nresolved?
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	443	remote changed file2 which local deleted
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	444	use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	445	no tool found to merge file3
27162 4ab69be0ea15 filemerge: add a 'leave unresolved' option to regular prompts Siddharth Agarwal <sid0@fb.com> parents: 27137 diff changeset	446	keep (l)ocal, take (o)ther, or leave (u)nresolved?
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	447	0 files updated, 0 files merged, 0 files removed, 3 files unresolved
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	448	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	449	[1]
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	450	$ status 2>&1 \| tee $TESTTMP/prompt.status
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	451	--- status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	452	M file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	453	M file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	454	C file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	455	--- resolve --list ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	456	U file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	457	U file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	458	U file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	459	--- debugmergestate ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	460	* version 2 records
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	461	local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	462	other: 10f9a0a634e82080907e62f075ab119cbc565ea6
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	463	file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	464	file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	465	local path: file1 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	466	ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	467	other path: file1 (node null)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	468	file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	469	file: file2 (record type "C", state "u", hash null)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	470	local path: file2 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	471	ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	472	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	473	file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	474	file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	475	local path: file3 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	476	ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	477	other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	478	--- file1 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	479	1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	480	changed
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	481	--- file2 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	482	2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	483	changed
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	484	--- file3 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	485	3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	486	changed2
27557 28b5c4fcf48d tests: Solaris diff -U also emits "No differences encountered" Danek Duvall <danek.duvall@oracle.com> parents: 27164 diff changeset	487	$ cmp $TESTTMP/fail.status $TESTTMP/prompt.status \|\| diff -U8 $TESTTMP/fail.status $TESTTMP/prompt.status
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	488
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	489
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	490	Force prompts
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	491
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	492	$ hg co -C
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	493	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	494
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	495	$ hg merge --tool :prompt
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	496	local changed file1 which remote deleted
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	497	use (c)hanged version, (d)elete, or leave (u)nresolved? u
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	498	remote changed file2 which local deleted
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	499	use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	500	no tool found to merge file3
27164 88d5db4b155c filemerge: default regular prompts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27163 diff changeset	501	keep (l)ocal, take (o)ther, or leave (u)nresolved? u
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	502	0 files updated, 0 files merged, 0 files removed, 3 files unresolved
27164 88d5db4b155c filemerge: default regular prompts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27163 diff changeset	503	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
88d5db4b155c filemerge: default regular prompts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27163 diff changeset	504	[1]
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	505	$ status
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	506	--- status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	507	M file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	508	M file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	509	C file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	510	--- resolve --list ---
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	511	U file1
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	512	U file2
27164 88d5db4b155c filemerge: default regular prompts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27163 diff changeset	513	U file3
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	514	--- debugmergestate ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	515	* version 2 records
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	516	local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	517	other: 10f9a0a634e82080907e62f075ab119cbc565ea6
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	518	file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	519	file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	520	local path: file1 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	521	ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	522	other path: file1 (node null)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	523	file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	524	file: file2 (record type "C", state "u", hash null)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	525	local path: file2 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	526	ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	527	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	528	file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27164 88d5db4b155c filemerge: default regular prompts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27163 diff changeset	529	file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	530	local path: file3 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	531	ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	532	other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	533	--- file1 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	534	1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	535	changed
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	536	--- file2 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	537	2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	538	changed
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	539	--- file3 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	540	3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	541	changed2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	542
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	543	Choose to merge all files
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	544
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	545	$ hg co -C
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	546	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	547
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	548	$ hg merge --tool :merge3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	549	local changed file1 which remote deleted
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	550	use (c)hanged version, (d)elete, or leave (u)nresolved? u
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	551	remote changed file2 which local deleted
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	552	use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	553	merging file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	554	warning: conflicts while merging file3! (edit, then use 'hg resolve --mark')
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	555	0 files updated, 0 files merged, 0 files removed, 3 files unresolved
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	556	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	557	[1]
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	558	$ status
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	559	--- status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	560	M file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	561	M file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	562	C file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	563	--- resolve --list ---
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	564	U file1
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	565	U file2
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	566	U file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	567	--- debugmergestate ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	568	* version 2 records
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	569	local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	570	other: 10f9a0a634e82080907e62f075ab119cbc565ea6
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	571	file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	572	file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	573	local path: file1 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	574	ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	575	other path: file1 (node null)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	576	file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	577	file: file2 (record type "C", state "u", hash null)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	578	local path: file2 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	579	ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	580	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	581	file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	582	file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	583	local path: file3 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	584	ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	585	other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	586	--- file1 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	587	1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	588	changed
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	589	--- file2 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	590	2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	591	changed
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	592	--- file3 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	593	3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	594	<<<<<<< local: 13910f48cf7b - test: changed file1, removed file2, changed file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	595	changed2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	596	\|\|\|\|\|\|\| base
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	597	=======
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	598	changed1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	599	>>>>>>> other: 10f9a0a634e8 - test: removed file1, changed file2, changed file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	600
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	601	Exercise transitions between local, other, fail and prompt, and make sure the
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	602	dirstate stays consistent. (Compare with each other and to the above
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	603	invocations.)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	604
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	605	$ testtransitions() {
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	606	> # this traversal order covers every transition
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	607	> tools="local other prompt local fail other local prompt other fail prompt fail local"
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	608	> lasttool="merge3"
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	609	> for tool in $tools; do
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	610	> echo "=== :$lasttool -> :$tool ==="
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	611	> ref="$TESTTMP/$tool.status"
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	612	> hg resolve --unmark --all
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	613	> hg resolve --tool ":$tool" --all --config ui.interactive=True
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	614	> status > "$TESTTMP/compare.status" 2>&1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	615	> echo '--- diff of status ---'
27557 28b5c4fcf48d tests: Solaris diff -U also emits "No differences encountered" Danek Duvall <danek.duvall@oracle.com> parents: 27164 diff changeset	616	> if cmp "$TESTTMP/$tool.status" "$TESTTMP/compare.status" \|\| diff -U8 "$TESTTMP/$tool.status" "$TESTTMP/compare.status"; then
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	617	> echo '(status identical)'
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	618	> fi
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	619	> lasttool="$tool"
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	620	> echo
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	621	> done
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	622	> }
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	623
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	624	$ testtransitions
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	625	=== :merge3 -> :local ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	626	(no more unresolved files)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	627	--- diff of status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	628	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	629
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	630	=== :local -> :other ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	631	(no more unresolved files)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	632	--- diff of status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	633	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	634
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	635	=== :other -> :prompt ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	636	local changed file1 which remote deleted
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	637	use (c)hanged version, (d)elete, or leave (u)nresolved?
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	638	remote changed file2 which local deleted
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	639	use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	640	no tool found to merge file3
27162 4ab69be0ea15 filemerge: add a 'leave unresolved' option to regular prompts Siddharth Agarwal <sid0@fb.com> parents: 27137 diff changeset	641	keep (l)ocal, take (o)ther, or leave (u)nresolved?
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	642	--- diff of status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	643	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	644
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	645	=== :prompt -> :local ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	646	(no more unresolved files)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	647	--- diff of status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	648	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	649
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	650	=== :local -> :fail ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	651	--- diff of status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	652	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	653
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	654	=== :fail -> :other ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	655	(no more unresolved files)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	656	--- diff of status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	657	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	658
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	659	=== :other -> :local ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	660	(no more unresolved files)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	661	--- diff of status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	662	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	663
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	664	=== :local -> :prompt ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	665	local changed file1 which remote deleted
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	666	use (c)hanged version, (d)elete, or leave (u)nresolved?
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	667	remote changed file2 which local deleted
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	668	use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	669	no tool found to merge file3
27162 4ab69be0ea15 filemerge: add a 'leave unresolved' option to regular prompts Siddharth Agarwal <sid0@fb.com> parents: 27137 diff changeset	670	keep (l)ocal, take (o)ther, or leave (u)nresolved?
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	671	--- diff of status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	672	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	673
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	674	=== :prompt -> :other ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	675	(no more unresolved files)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	676	--- diff of status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	677	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	678
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	679	=== :other -> :fail ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	680	--- diff of status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	681	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	682
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	683	=== :fail -> :prompt ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	684	local changed file1 which remote deleted
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	685	use (c)hanged version, (d)elete, or leave (u)nresolved?
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	686	remote changed file2 which local deleted
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	687	use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	688	no tool found to merge file3
27162 4ab69be0ea15 filemerge: add a 'leave unresolved' option to regular prompts Siddharth Agarwal <sid0@fb.com> parents: 27137 diff changeset	689	keep (l)ocal, take (o)ther, or leave (u)nresolved?
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	690	--- diff of status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	691	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	692
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	693	=== :prompt -> :fail ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	694	--- diff of status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	695	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	696
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	697	=== :fail -> :local ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	698	(no more unresolved files)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	699	--- diff of status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	700	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	701
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	702
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	703
26850 00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 22589 diff changeset	704	Non-interactive linear update
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 22589 diff changeset	705
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 22589 diff changeset	706	$ hg co -C 0
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	707	3 files updated, 0 files merged, 0 files removed, 0 files unresolved
26850 00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 22589 diff changeset	708	$ echo changed >> file1
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 22589 diff changeset	709	$ hg rm file2
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 22589 diff changeset	710	$ hg update 1 -y
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 22589 diff changeset	711	local changed file1 which remote deleted
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	712	use (c)hanged version, (d)elete, or leave (u)nresolved? u
26850 00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 22589 diff changeset	713	remote changed file2 which local deleted
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	714	use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	715	1 files updated, 0 files merged, 0 files removed, 2 files unresolved
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	716	use 'hg resolve' to retry unresolved file merges
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	717	[1]
26850 00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 22589 diff changeset	718	$ status
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 22589 diff changeset	719	--- status ---
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 22589 diff changeset	720	A file1
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 22589 diff changeset	721	C file2
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	722	C file3
27126 72b4e1bf8f28 test-merge-changedelete.t: add resolve --list output Siddharth Agarwal <sid0@fb.com> parents: 27125 diff changeset	723	--- resolve --list ---
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	724	U file1
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	725	U file2
27136 29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	726	--- debugmergestate ---
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	727	* version 2 records
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	728	local: ab57bf49aa276a22d35a473592d4c34b5abc3eff
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	729	other: 10f9a0a634e82080907e62f075ab119cbc565ea6
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	730	file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	731	file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	732	local path: file1 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	733	ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	734	other path: file1 (node null)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	735	file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	736	file: file2 (record type "C", state "u", hash null)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	737	local path: file2 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	738	ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	739	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	740	--- file1 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	741	1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	742	changed
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	743	--- file2 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	744	2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	745	changed
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	746	--- file3 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	747	3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	748	changed1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	749
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	750	Choose local versions of files
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	751
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	752	$ hg co -C 0
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	753	3 files updated, 0 files merged, 0 files removed, 0 files unresolved
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	754	$ echo changed >> file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	755	$ hg rm file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	756	$ hg update 1 --tool :local
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	757	1 files updated, 2 files merged, 0 files removed, 0 files unresolved
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	758	$ status 2>&1 \| tee $TESTTMP/local.status
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	759	--- status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	760	file2: * (glob)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	761	A file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	762	C file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	763	--- resolve --list ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	764	R file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	765	R file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	766	--- debugmergestate ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	767	* version 2 records
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	768	local: ab57bf49aa276a22d35a473592d4c34b5abc3eff
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	769	other: 10f9a0a634e82080907e62f075ab119cbc565ea6
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	770	file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	771	file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	772	local path: file1 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	773	ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	774	other path: file1 (node null)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	775	file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	776	file: file2 (record type "C", state "r", hash null)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	777	local path: file2 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	778	ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	779	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	780	--- file1 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	781	1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	782	changed
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	783	*** file2 does not exist
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	784	--- file3 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	785	3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	786	changed1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	787
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	788	Choose other versions of files
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	789
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	790	$ hg co -C 0
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	791	3 files updated, 0 files merged, 0 files removed, 0 files unresolved
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	792	$ echo changed >> file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	793	$ hg rm file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	794	$ hg update 1 --tool :other
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	795	1 files updated, 1 files merged, 1 files removed, 0 files unresolved
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	796	$ status 2>&1 \| tee $TESTTMP/other.status
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	797	--- status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	798	file1: * (glob)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	799	C file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	800	C file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	801	--- resolve --list ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	802	R file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	803	R file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	804	--- debugmergestate ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	805	* version 2 records
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	806	local: ab57bf49aa276a22d35a473592d4c34b5abc3eff
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	807	other: 10f9a0a634e82080907e62f075ab119cbc565ea6
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	808	file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	809	file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	810	local path: file1 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	811	ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	812	other path: file1 (node null)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	813	file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	814	file: file2 (record type "C", state "r", hash null)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	815	local path: file2 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	816	ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	817	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	818	*** file1 does not exist
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	819	--- file2 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	820	2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	821	changed
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	822	--- file3 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	823	3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	824	changed1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	825
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	826	Fail
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	827
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	828	$ hg co -C 0
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	829	3 files updated, 0 files merged, 0 files removed, 0 files unresolved
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	830	$ echo changed >> file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	831	$ hg rm file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	832	$ hg update 1 --tool :fail
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	833	1 files updated, 0 files merged, 0 files removed, 2 files unresolved
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	834	use 'hg resolve' to retry unresolved file merges
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	835	[1]
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	836	$ status 2>&1 \| tee $TESTTMP/fail.status
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	837	--- status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	838	A file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	839	C file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	840	C file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	841	--- resolve --list ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	842	U file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	843	U file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	844	--- debugmergestate ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	845	* version 2 records
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	846	local: ab57bf49aa276a22d35a473592d4c34b5abc3eff
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	847	other: 10f9a0a634e82080907e62f075ab119cbc565ea6
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	848	file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	849	file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	850	local path: file1 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	851	ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	852	other path: file1 (node null)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	853	file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	854	file: file2 (record type "C", state "u", hash null)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	855	local path: file2 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	856	ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	857	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
26850 00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 22589 diff changeset	858	--- file1 ---
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 22589 diff changeset	859	1
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 22589 diff changeset	860	changed
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 22589 diff changeset	861	--- file2 ---
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 22589 diff changeset	862	2
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 22589 diff changeset	863	changed
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	864	--- file3 ---
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	865	3
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	866	changed1
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	867
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	868	Force prompts with no input
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	869
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	870	$ hg co -C 0
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	871	3 files updated, 0 files merged, 0 files removed, 0 files unresolved
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	872	$ echo changed >> file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	873	$ hg rm file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	874	$ hg update 1 --config ui.interactive=True --tool :prompt
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	875	local changed file1 which remote deleted
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	876	use (c)hanged version, (d)elete, or leave (u)nresolved?
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	877	remote changed file2 which local deleted
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	878	use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	879	1 files updated, 0 files merged, 0 files removed, 2 files unresolved
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	880	use 'hg resolve' to retry unresolved file merges
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	881	[1]
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	882	$ status 2>&1 \| tee $TESTTMP/prompt.status
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	883	--- status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	884	A file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	885	C file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	886	C file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	887	--- resolve --list ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	888	U file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	889	U file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	890	--- debugmergestate ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	891	* version 2 records
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	892	local: ab57bf49aa276a22d35a473592d4c34b5abc3eff
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	893	other: 10f9a0a634e82080907e62f075ab119cbc565ea6
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	894	file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	895	file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	896	local path: file1 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	897	ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	898	other path: file1 (node null)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	899	file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	900	file: file2 (record type "C", state "u", hash null)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	901	local path: file2 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	902	ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	903	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	904	--- file1 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	905	1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	906	changed
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	907	--- file2 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	908	2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	909	changed
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	910	--- file3 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	911	3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	912	changed1
27557 28b5c4fcf48d tests: Solaris diff -U also emits "No differences encountered" Danek Duvall <danek.duvall@oracle.com> parents: 27164 diff changeset	913	$ cmp $TESTTMP/fail.status $TESTTMP/prompt.status \|\| diff -U8 $TESTTMP/fail.status $TESTTMP/prompt.status
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	914
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	915	Choose to merge all files
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	916
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	917	$ hg co -C 0
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	918	3 files updated, 0 files merged, 0 files removed, 0 files unresolved
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	919	$ echo changed >> file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	920	$ hg rm file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	921	$ hg update 1 --tool :merge3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	922	local changed file1 which remote deleted
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	923	use (c)hanged version, (d)elete, or leave (u)nresolved? u
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	924	remote changed file2 which local deleted
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	925	use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	926	1 files updated, 0 files merged, 0 files removed, 2 files unresolved
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	927	use 'hg resolve' to retry unresolved file merges
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	928	[1]
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	929	$ status
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	930	--- status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	931	A file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	932	C file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	933	C file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	934	--- resolve --list ---
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	935	U file1
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	936	U file2
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	937	--- debugmergestate ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	938	* version 2 records
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	939	local: ab57bf49aa276a22d35a473592d4c34b5abc3eff
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	940	other: 10f9a0a634e82080907e62f075ab119cbc565ea6
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	941	file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	942	file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	943	local path: file1 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	944	ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	945	other path: file1 (node null)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	946	file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	947	file: file2 (record type "C", state "u", hash null)
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	948	local path: file2 (flags "")
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	949	ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	950	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	951	--- file1 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	952	1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	953	changed
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	954	--- file2 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	955	2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	956	changed
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	957	--- file3 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	958	3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	959	changed1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	960
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	961	Test transitions between different merge tools
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	962
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	963	$ testtransitions
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	964	=== :merge3 -> :local ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	965	(no more unresolved files)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	966	--- diff of status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	967	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	968
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	969	=== :local -> :other ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	970	(no more unresolved files)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	971	--- diff of status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	972	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	973
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	974	=== :other -> :prompt ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	975	local changed file1 which remote deleted
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	976	use (c)hanged version, (d)elete, or leave (u)nresolved?
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	977	remote changed file2 which local deleted
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	978	use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	979	--- diff of status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	980	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	981
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	982	=== :prompt -> :local ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	983	(no more unresolved files)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	984	--- diff of status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	985	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	986
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	987	=== :local -> :fail ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	988	--- diff of status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	989	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	990
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	991	=== :fail -> :other ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	992	(no more unresolved files)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	993	--- diff of status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	994	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	995
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	996	=== :other -> :local ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	997	(no more unresolved files)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	998	--- diff of status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	999	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1000
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1001	=== :local -> :prompt ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1002	local changed file1 which remote deleted
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	1003	use (c)hanged version, (d)elete, or leave (u)nresolved?
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1004	remote changed file2 which local deleted
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	1005	use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1006	--- diff of status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1007	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1008
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1009	=== :prompt -> :other ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1010	(no more unresolved files)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1011	--- diff of status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1012	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1013
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1014	=== :other -> :fail ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1015	--- diff of status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1016	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1017
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1018	=== :fail -> :prompt ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1019	local changed file1 which remote deleted
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	1020	use (c)hanged version, (d)elete, or leave (u)nresolved?
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1021	remote changed file2 which local deleted
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	1022	use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1023	--- diff of status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1024	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1025
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1026	=== :prompt -> :fail ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1027	--- diff of status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1028	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1029
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1030	=== :fail -> :local ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1031	(no more unresolved files)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1032	--- diff of status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1033	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1034

author	Durham Goode <durham@fb.com>
	Fri, 05 Feb 2016 10:22:14 -0800
changeset 28011	8abd9f785030
parent 27599	ad5966de3c9a
child 28029	72072cfc7e91
permissions	-rw-r--r--