mercurial: tests/test-merge-changedelete.t@a3fd84f4fb38 (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
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	57	file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
39277 f785073f792c merge: improve interactive one-changed one-deleted message (issue5550) Augie Fackler <augie@google.com> parents: 35704 diff changeset	58	What do you want to do?
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	59	use (c)hanged version, (d)elete, or leave (u)nresolved? u
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	60	file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
39277 f785073f792c merge: improve interactive one-changed one-deleted message (issue5550) Augie Fackler <augie@google.com> parents: 35704 diff changeset	61	What do you want to do?
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	62	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	63	merging file3
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	64	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	65	0 files updated, 0 files merged, 0 files removed, 3 files unresolved
35704 41ef02ba329b merge: add `--abort` flag which can abort the merge Pulkit Goyal <7895pulkit@gmail.com> parents: 32698 diff changeset	66	use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	67	[1]
5672 8a65ea986755 Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge) Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	68
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	69	$ status
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	70	--- status ---
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	71	M file2
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	72	M file3
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	73	C file1
27126 72b4e1bf8f28 test-merge-changedelete.t: add resolve --list output Siddharth Agarwal <sid0@fb.com> parents: 27125 diff changeset	74	--- resolve --list ---
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	75	U file1
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	76	U file2
27126 72b4e1bf8f28 test-merge-changedelete.t: add resolve --list output Siddharth Agarwal <sid0@fb.com> parents: 27125 diff changeset	77	U file3
27136 29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	78	--- debugmergestate ---
29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	79	* version 2 records
29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	80	local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	81	other: 10f9a0a634e82080907e62f075ab119cbc565ea6
30062 940c05b25b07 merge: add conflict labels to merge command Simon Farnsworth <simonfar@fb.com> parents: 29775 diff changeset	82	labels:
940c05b25b07 merge: add conflict labels to merge command Simon Farnsworth <simonfar@fb.com> parents: 29775 diff changeset	83	local: working copy
940c05b25b07 merge: add conflict labels to merge command Simon Farnsworth <simonfar@fb.com> parents: 29775 diff changeset	84	other: merge rev
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	85	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	86	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	87	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	88	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	89	other path: file1 (node null)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	90	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	91	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	92	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	93	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	94	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	95	file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27136 29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	96	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	97	local path: file3 (flags "")
29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	98	ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	99	other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	100	--- file1 ---
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	101	1
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	102	changed
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	103	--- file2 ---
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	104	2
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	105	changed
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	106	--- file3 ---
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	107	3
30062 940c05b25b07 merge: add conflict labels to merge command Simon Farnsworth <simonfar@fb.com> parents: 29775 diff changeset	108	<<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan...
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	109	changed2
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	110	=======
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	111	changed1
30460 ce3a133f71b3 conflicts: make spacing consistent in conflict markers Kostia Balytskyi <ikostia@fb.com> parents: 30062 diff changeset	112	>>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, chan...
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	113
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	114
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	115	Interactive merge:
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	116
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	117	$ 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	118	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
32698 1b5c61d38a52 update: show the commit to which we updated in case of multiple heads (BC) Pulkit Goyal <7895pulkit@gmail.com> parents: 32253 diff changeset	119	updated to "13910f48cf7b: changed file1, removed file2, changed file3"
28029 72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 28011 diff changeset	120	1 other heads for branch "default"
5672 8a65ea986755 Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge) Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	121
12365 22f3353bcc36 tests: cleanup exit code handling in unified tests Matt Mackall <mpm@selenic.com> parents: 12328 diff changeset	122	$ hg merge --config ui.interactive=true <<EOF
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	123	> c
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	124	> d
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	125	> EOF
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	126	file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
39277 f785073f792c merge: improve interactive one-changed one-deleted message (issue5550) Augie Fackler <augie@google.com> parents: 35704 diff changeset	127	What do you want to do?
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	128	use (c)hanged version, (d)elete, or leave (u)nresolved? c
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	129	file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
39277 f785073f792c merge: improve interactive one-changed one-deleted message (issue5550) Augie Fackler <augie@google.com> parents: 35704 diff changeset	130	What do you want to do?
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	131	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	132	merging file3
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	133	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	134	0 files updated, 2 files merged, 0 files removed, 1 files unresolved
35704 41ef02ba329b merge: add `--abort` flag which can abort the merge Pulkit Goyal <7895pulkit@gmail.com> parents: 32698 diff changeset	135	use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	136	[1]
5672 8a65ea986755 Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge) Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	137
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	138	$ status
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	139	--- status ---
15521 117f9190c1ba tests: hide 'No such file or directory' messages Mads Kiilerich <mads@kiilerich.com> parents: 12365 diff changeset	140	file2: * (glob)
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	141	M file3
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	142	C file1
27126 72b4e1bf8f28 test-merge-changedelete.t: add resolve --list output Siddharth Agarwal <sid0@fb.com> parents: 27125 diff changeset	143	--- 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	144	R file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	145	R file2
27126 72b4e1bf8f28 test-merge-changedelete.t: add resolve --list output Siddharth Agarwal <sid0@fb.com> parents: 27125 diff changeset	146	U file3
27136 29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	147	--- debugmergestate ---
29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	148	* version 2 records
29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	149	local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	150	other: 10f9a0a634e82080907e62f075ab119cbc565ea6
30062 940c05b25b07 merge: add conflict labels to merge command Simon Farnsworth <simonfar@fb.com> parents: 29775 diff changeset	151	labels:
940c05b25b07 merge: add conflict labels to merge command Simon Farnsworth <simonfar@fb.com> parents: 29775 diff changeset	152	local: working copy
940c05b25b07 merge: add conflict labels to merge command Simon Farnsworth <simonfar@fb.com> parents: 29775 diff changeset	153	other: merge rev
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	154	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	155	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	156	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	157	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	158	other path: file1 (node null)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	159	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	160	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	161	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	162	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	163	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	164	file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27136 29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	165	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	166	local path: file3 (flags "")
29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	167	ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	168	other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	169	--- file1 ---
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	170	1
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	171	changed
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	172	*** 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	173	--- file3 ---
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	174	3
30062 940c05b25b07 merge: add conflict labels to merge command Simon Farnsworth <simonfar@fb.com> parents: 29775 diff changeset	175	<<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan...
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	176	changed2
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	177	=======
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	178	changed1
30460 ce3a133f71b3 conflicts: make spacing consistent in conflict markers Kostia Balytskyi <ikostia@fb.com> parents: 30062 diff changeset	179	>>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, chan...
5672 8a65ea986755 Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge) Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	180
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	181
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	182	Interactive merge with bad input:
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	183
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	184	$ 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	185	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
32698 1b5c61d38a52 update: show the commit to which we updated in case of multiple heads (BC) Pulkit Goyal <7895pulkit@gmail.com> parents: 32253 diff changeset	186	updated to "13910f48cf7b: changed file1, removed file2, changed file3"
28029 72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 28011 diff changeset	187	1 other heads for branch "default"
5672 8a65ea986755 Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge) Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	188
12365 22f3353bcc36 tests: cleanup exit code handling in unified tests Matt Mackall <mpm@selenic.com> parents: 12328 diff changeset	189	$ hg merge --config ui.interactive=true <<EOF
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	190	> foo
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	191	> bar
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	192	> d
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	193	> baz
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	194	> c
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	195	> EOF
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	196	file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
39277 f785073f792c merge: improve interactive one-changed one-deleted message (issue5550) Augie Fackler <augie@google.com> parents: 35704 diff changeset	197	What do you want to do?
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	198	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	199	unrecognized response
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	200	file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
39277 f785073f792c merge: improve interactive one-changed one-deleted message (issue5550) Augie Fackler <augie@google.com> parents: 35704 diff changeset	201	What do you want to do?
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	202	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	203	unrecognized response
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	204	file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
39277 f785073f792c merge: improve interactive one-changed one-deleted message (issue5550) Augie Fackler <augie@google.com> parents: 35704 diff changeset	205	What do you want to do?
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	206	use (c)hanged version, (d)elete, or leave (u)nresolved? d
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	207	file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
39277 f785073f792c merge: improve interactive one-changed one-deleted message (issue5550) Augie Fackler <augie@google.com> parents: 35704 diff changeset	208	What do you want to do?
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	209	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	210	unrecognized response
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	211	file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
39277 f785073f792c merge: improve interactive one-changed one-deleted message (issue5550) Augie Fackler <augie@google.com> parents: 35704 diff changeset	212	What do you want to do?
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	213	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	214	merging file3
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	215	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	216	0 files updated, 1 files merged, 1 files removed, 1 files unresolved
35704 41ef02ba329b merge: add `--abort` flag which can abort the merge Pulkit Goyal <7895pulkit@gmail.com> parents: 32698 diff changeset	217	use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	218	[1]
5672 8a65ea986755 Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge) Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	219
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	220	$ status
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	221	--- status ---
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	222	M file2
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	223	M file3
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	224	R file1
27126 72b4e1bf8f28 test-merge-changedelete.t: add resolve --list output Siddharth Agarwal <sid0@fb.com> parents: 27125 diff changeset	225	--- 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	226	R file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	227	R file2
27126 72b4e1bf8f28 test-merge-changedelete.t: add resolve --list output Siddharth Agarwal <sid0@fb.com> parents: 27125 diff changeset	228	U file3
27136 29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	229	--- debugmergestate ---
29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	230	* version 2 records
29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	231	local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	232	other: 10f9a0a634e82080907e62f075ab119cbc565ea6
30062 940c05b25b07 merge: add conflict labels to merge command Simon Farnsworth <simonfar@fb.com> parents: 29775 diff changeset	233	labels:
940c05b25b07 merge: add conflict labels to merge command Simon Farnsworth <simonfar@fb.com> parents: 29775 diff changeset	234	local: working copy
940c05b25b07 merge: add conflict labels to merge command Simon Farnsworth <simonfar@fb.com> parents: 29775 diff changeset	235	other: merge rev
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	236	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	237	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	238	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	239	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	240	other path: file1 (node null)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	241	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	242	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	243	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	244	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	245	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	246	file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27136 29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	247	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	248	local path: file3 (flags "")
29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	249	ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	250	other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	251	*** file1 does not exist
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	252	--- file2 ---
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	253	2
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	254	changed
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	255	--- file3 ---
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	256	3
30062 940c05b25b07 merge: add conflict labels to merge command Simon Farnsworth <simonfar@fb.com> parents: 29775 diff changeset	257	<<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan...
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	258	changed2
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	259	=======
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	260	changed1
30460 ce3a133f71b3 conflicts: make spacing consistent in conflict markers Kostia Balytskyi <ikostia@fb.com> parents: 30062 diff changeset	261	>>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, chan...
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	262
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	263
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	264	Interactive merge with not enough input:
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	265
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	266	$ 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	267	2 files updated, 0 files merged, 1 files removed, 0 files unresolved
32698 1b5c61d38a52 update: show the commit to which we updated in case of multiple heads (BC) Pulkit Goyal <7895pulkit@gmail.com> parents: 32253 diff changeset	268	updated to "13910f48cf7b: changed file1, removed file2, changed file3"
28029 72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 28011 diff changeset	269	1 other heads for branch "default"
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	270
12365 22f3353bcc36 tests: cleanup exit code handling in unified tests Matt Mackall <mpm@selenic.com> parents: 12328 diff changeset	271	$ hg merge --config ui.interactive=true <<EOF
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	272	> d
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	273	> EOF
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	274	file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
39277 f785073f792c merge: improve interactive one-changed one-deleted message (issue5550) Augie Fackler <augie@google.com> parents: 35704 diff changeset	275	What do you want to do?
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	276	use (c)hanged version, (d)elete, or leave (u)nresolved? d
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	277	file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
39277 f785073f792c merge: improve interactive one-changed one-deleted message (issue5550) Augie Fackler <augie@google.com> parents: 35704 diff changeset	278	What do you want to do?
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	279	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	280	merging file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	281	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	282	0 files updated, 0 files merged, 1 files removed, 2 files unresolved
35704 41ef02ba329b merge: add `--abort` flag which can abort the merge Pulkit Goyal <7895pulkit@gmail.com> parents: 32698 diff changeset	283	use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	284	[1]
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	285
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	286	$ status
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	287	--- status ---
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	288	M file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	289	M file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	290	R file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	291	--- resolve --list ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	292	R file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	293	U file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	294	U file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	295	--- debugmergestate ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	296	* 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	297	local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	298	other: 10f9a0a634e82080907e62f075ab119cbc565ea6
30062 940c05b25b07 merge: add conflict labels to merge command Simon Farnsworth <simonfar@fb.com> parents: 29775 diff changeset	299	labels:
940c05b25b07 merge: add conflict labels to merge command Simon Farnsworth <simonfar@fb.com> parents: 29775 diff changeset	300	local: working copy
940c05b25b07 merge: add conflict labels to merge command Simon Farnsworth <simonfar@fb.com> parents: 29775 diff changeset	301	other: merge rev
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	302	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	303	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	304	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	305	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	306	other path: file1 (node null)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	307	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	308	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	309	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	310	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	311	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	312	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	313	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	314	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	315	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	316	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	317	*** 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	318	--- file2 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	319	2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	320	changed
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	321	--- file3 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	322	3
30062 940c05b25b07 merge: add conflict labels to merge command Simon Farnsworth <simonfar@fb.com> parents: 29775 diff changeset	323	<<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan...
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	324	changed2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	325	=======
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	326	changed1
30460 ce3a133f71b3 conflicts: make spacing consistent in conflict markers Kostia Balytskyi <ikostia@fb.com> parents: 30062 diff changeset	327	>>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, chan...
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	328
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	329	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	330
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	331	$ 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	332	2 files updated, 0 files merged, 1 files removed, 0 files unresolved
32698 1b5c61d38a52 update: show the commit to which we updated in case of multiple heads (BC) Pulkit Goyal <7895pulkit@gmail.com> parents: 32253 diff changeset	333	updated to "13910f48cf7b: changed file1, removed file2, changed file3"
28029 72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 28011 diff changeset	334	1 other heads for branch "default"
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	335
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	336	$ 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	337	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	338	(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	339	$ 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	340	--- status ---
15521 117f9190c1ba tests: hide 'No such file or directory' messages Mads Kiilerich <mads@kiilerich.com> parents: 12365 diff changeset	341	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	342	M file3
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	343	C file1
27126 72b4e1bf8f28 test-merge-changedelete.t: add resolve --list output Siddharth Agarwal <sid0@fb.com> parents: 27125 diff changeset	344	--- 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	345	R file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	346	R file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	347	R file3
27136 29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	348	--- debugmergestate ---
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	349	* 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	350	local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	351	other: 10f9a0a634e82080907e62f075ab119cbc565ea6
30062 940c05b25b07 merge: add conflict labels to merge command Simon Farnsworth <simonfar@fb.com> parents: 29775 diff changeset	352	labels:
940c05b25b07 merge: add conflict labels to merge command Simon Farnsworth <simonfar@fb.com> parents: 29775 diff changeset	353	local: working copy
940c05b25b07 merge: add conflict labels to merge command Simon Farnsworth <simonfar@fb.com> parents: 29775 diff changeset	354	other: merge rev
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	355	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	356	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	357	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	358	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	359	other path: file1 (node null)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	360	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	361	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	362	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	363	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	364	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	365	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	366	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	367	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	368	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	369	other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	370	--- file1 ---
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	371	1
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	372	changed
7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	373	*** 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	374	--- file3 ---
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	375	3
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	376	changed2
12259 7b05cb9ac6d2 tests: unify test-merge-prompt Adrian Buehlmann <adrian@cadifra.com> parents: 5672 diff changeset	377
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	378	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	379
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	380	$ 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	381	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
32698 1b5c61d38a52 update: show the commit to which we updated in case of multiple heads (BC) Pulkit Goyal <7895pulkit@gmail.com> parents: 32253 diff changeset	382	updated to "13910f48cf7b: changed file1, removed file2, changed file3"
28029 72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 28011 diff changeset	383	1 other heads for branch "default"
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	384
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	385	$ 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	386	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	387	(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	388	$ 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	389	--- status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	390	M file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	391	M file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	392	R file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	393	--- resolve --list ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	394	R file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	395	R file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	396	R file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	397	--- debugmergestate ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	398	* 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	399	local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	400	other: 10f9a0a634e82080907e62f075ab119cbc565ea6
30062 940c05b25b07 merge: add conflict labels to merge command Simon Farnsworth <simonfar@fb.com> parents: 29775 diff changeset	401	labels:
940c05b25b07 merge: add conflict labels to merge command Simon Farnsworth <simonfar@fb.com> parents: 29775 diff changeset	402	local: working copy
940c05b25b07 merge: add conflict labels to merge command Simon Farnsworth <simonfar@fb.com> parents: 29775 diff changeset	403	other: merge rev
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	404	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	405	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	406	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	407	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	408	other path: file1 (node null)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	409	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	410	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	411	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	412	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	413	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	414	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	415	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	416	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	417	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	418	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	419	*** 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	420	--- file2 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	421	2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	422	changed
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	423	--- file3 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	424	3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	425	changed1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	426
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	427	Fail
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	428
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	429	$ 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	430	2 files updated, 0 files merged, 1 files removed, 0 files unresolved
32698 1b5c61d38a52 update: show the commit to which we updated in case of multiple heads (BC) Pulkit Goyal <7895pulkit@gmail.com> parents: 32253 diff changeset	431	updated to "13910f48cf7b: changed file1, removed file2, changed file3"
28029 72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 28011 diff changeset	432	1 other heads for branch "default"
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	433
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	434	$ 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	435	0 files updated, 0 files merged, 0 files removed, 3 files unresolved
35704 41ef02ba329b merge: add `--abort` flag which can abort the merge Pulkit Goyal <7895pulkit@gmail.com> parents: 32698 diff changeset	436	use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	437	[1]
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	438	$ 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	439	--- status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	440	M file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	441	M file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	442	C file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	443	--- resolve --list ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	444	U file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	445	U file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	446	U file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	447	--- debugmergestate ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	448	* 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	449	local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	450	other: 10f9a0a634e82080907e62f075ab119cbc565ea6
30062 940c05b25b07 merge: add conflict labels to merge command Simon Farnsworth <simonfar@fb.com> parents: 29775 diff changeset	451	labels:
940c05b25b07 merge: add conflict labels to merge command Simon Farnsworth <simonfar@fb.com> parents: 29775 diff changeset	452	local: working copy
940c05b25b07 merge: add conflict labels to merge command Simon Farnsworth <simonfar@fb.com> parents: 29775 diff changeset	453	other: merge rev
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	454	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	455	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	456	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	457	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	458	other path: file1 (node null)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	459	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	460	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	461	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	462	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	463	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	464	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	465	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	466	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	467	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	468	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	469	--- file1 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	470	1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	471	changed
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	472	--- file2 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	473	2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	474	changed
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	475	--- file3 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	476	3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	477	changed2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	478
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	479	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	480
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	481	$ 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	482	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
32698 1b5c61d38a52 update: show the commit to which we updated in case of multiple heads (BC) Pulkit Goyal <7895pulkit@gmail.com> parents: 32253 diff changeset	483	updated to "13910f48cf7b: changed file1, removed file2, changed file3"
28029 72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 28011 diff changeset	484	1 other heads for branch "default"
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	485
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	486	$ hg merge --config ui.interactive=True --tool :prompt
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	487	file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
39277 f785073f792c merge: improve interactive one-changed one-deleted message (issue5550) Augie Fackler <augie@google.com> parents: 35704 diff changeset	488	What do you want to do?
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	489	use (c)hanged version, (d)elete, or leave (u)nresolved?
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	490	file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
39277 f785073f792c merge: improve interactive one-changed one-deleted message (issue5550) Augie Fackler <augie@google.com> parents: 35704 diff changeset	491	What do you want to do?
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	492	use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
32253 7d4ce4b567c5 filemerge: show warning about choice of :prompt only at an actual fallback FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 30460 diff changeset	493	keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3?
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	494	0 files updated, 0 files merged, 0 files removed, 3 files unresolved
35704 41ef02ba329b merge: add `--abort` flag which can abort the merge Pulkit Goyal <7895pulkit@gmail.com> parents: 32698 diff changeset	495	use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	496	[1]
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	497	$ 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	498	--- status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	499	M file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	500	M file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	501	C file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	502	--- resolve --list ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	503	U file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	504	U file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	505	U file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	506	--- debugmergestate ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	507	* 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	508	local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	509	other: 10f9a0a634e82080907e62f075ab119cbc565ea6
30062 940c05b25b07 merge: add conflict labels to merge command Simon Farnsworth <simonfar@fb.com> parents: 29775 diff changeset	510	labels:
940c05b25b07 merge: add conflict labels to merge command Simon Farnsworth <simonfar@fb.com> parents: 29775 diff changeset	511	local: working copy
940c05b25b07 merge: add conflict labels to merge command Simon Farnsworth <simonfar@fb.com> parents: 29775 diff changeset	512	other: merge rev
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	513	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	514	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	515	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	516	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	517	other path: file1 (node null)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	518	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	519	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	520	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	521	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	522	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	523	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	524	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	525	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	526	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	527	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	528	--- file1 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	529	1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	530	changed
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	531	--- file2 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	532	2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	533	changed
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	534	--- file3 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	535	3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	536	changed2
27557 28b5c4fcf48d tests: Solaris diff -U also emits "No differences encountered" Danek Duvall <danek.duvall@oracle.com> parents: 27164 diff changeset	537	$ 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	538
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	539
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	540	Force prompts
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	541
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	542	$ 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	543	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
32698 1b5c61d38a52 update: show the commit to which we updated in case of multiple heads (BC) Pulkit Goyal <7895pulkit@gmail.com> parents: 32253 diff changeset	544	updated to "13910f48cf7b: changed file1, removed file2, changed file3"
28029 72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 28011 diff changeset	545	1 other heads for branch "default"
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	546
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	547	$ hg merge --tool :prompt
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	548	file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
39277 f785073f792c merge: improve interactive one-changed one-deleted message (issue5550) Augie Fackler <augie@google.com> parents: 35704 diff changeset	549	What do you want to do?
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
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	551	file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
39277 f785073f792c merge: improve interactive one-changed one-deleted message (issue5550) Augie Fackler <augie@google.com> parents: 35704 diff changeset	552	What do you want to do?
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	553	use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
32253 7d4ce4b567c5 filemerge: show warning about choice of :prompt only at an actual fallback FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 30460 diff changeset	554	keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3? u
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
35704 41ef02ba329b merge: add `--abort` flag which can abort the merge Pulkit Goyal <7895pulkit@gmail.com> parents: 32698 diff changeset	556	use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
27164 88d5db4b155c filemerge: default regular prompts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27163 diff changeset	557	[1]
27137 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
27164 88d5db4b155c filemerge: default regular prompts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27163 diff changeset	566	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	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
30062 940c05b25b07 merge: add conflict labels to merge command Simon Farnsworth <simonfar@fb.com> parents: 29775 diff changeset	571	labels:
940c05b25b07 merge: add conflict labels to merge command Simon Farnsworth <simonfar@fb.com> parents: 29775 diff changeset	572	local: working copy
940c05b25b07 merge: add conflict labels to merge command Simon Farnsworth <simonfar@fb.com> parents: 29775 diff changeset	573	other: merge rev
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	574	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	575	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	576	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	577	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	578	other path: file1 (node null)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	579	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	580	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	581	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	582	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	583	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	584	file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
27164 88d5db4b155c filemerge: default regular prompts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27163 diff changeset	585	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	586	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	587	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	588	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	589	--- file1 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	590	1
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	--- file2 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	593	2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	594	changed
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	595	--- file3 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	596	3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	597	changed2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	598
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	599	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	600
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	601	$ 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	602	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
32698 1b5c61d38a52 update: show the commit to which we updated in case of multiple heads (BC) Pulkit Goyal <7895pulkit@gmail.com> parents: 32253 diff changeset	603	updated to "13910f48cf7b: changed file1, removed file2, changed file3"
28029 72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 28011 diff changeset	604	1 other heads for branch "default"
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	605
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	606	$ hg merge --tool :merge3
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	607	file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
39277 f785073f792c merge: improve interactive one-changed one-deleted message (issue5550) Augie Fackler <augie@google.com> parents: 35704 diff changeset	608	What do you want to do?
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	609	use (c)hanged version, (d)elete, or leave (u)nresolved? u
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	610	file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
39277 f785073f792c merge: improve interactive one-changed one-deleted message (issue5550) Augie Fackler <augie@google.com> parents: 35704 diff changeset	611	What do you want to do?
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	612	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	613	merging file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	614	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	615	0 files updated, 0 files merged, 0 files removed, 3 files unresolved
35704 41ef02ba329b merge: add `--abort` flag which can abort the merge Pulkit Goyal <7895pulkit@gmail.com> parents: 32698 diff changeset	616	use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	617	[1]
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	618	$ status
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	619	--- status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	620	M file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	621	M file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	622	C file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	623	--- resolve --list ---
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	624	U file1
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	625	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	626	U file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	627	--- debugmergestate ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	628	* 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	629	local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	630	other: 10f9a0a634e82080907e62f075ab119cbc565ea6
30062 940c05b25b07 merge: add conflict labels to merge command Simon Farnsworth <simonfar@fb.com> parents: 29775 diff changeset	631	labels:
940c05b25b07 merge: add conflict labels to merge command Simon Farnsworth <simonfar@fb.com> parents: 29775 diff changeset	632	local: working copy
940c05b25b07 merge: add conflict labels to merge command Simon Farnsworth <simonfar@fb.com> parents: 29775 diff changeset	633	other: merge rev
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	634	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	635	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	636	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	637	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	638	other path: file1 (node null)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	639	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	640	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	641	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	642	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	643	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	644	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	645	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	646	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	647	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	648	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	649	--- file1 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	650	1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	651	changed
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	652	--- file2 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	653	2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	654	changed
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	655	--- file3 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	656	3
30062 940c05b25b07 merge: add conflict labels to merge command Simon Farnsworth <simonfar@fb.com> parents: 29775 diff changeset	657	<<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan...
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	658	changed2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	659	\|\|\|\|\|\|\| base
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	660	=======
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	661	changed1
30460 ce3a133f71b3 conflicts: make spacing consistent in conflict markers Kostia Balytskyi <ikostia@fb.com> parents: 30062 diff changeset	662	>>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, chan...
27137 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	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	665	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	666	invocations.)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	667
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	668	$ testtransitions() {
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	669	> # 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	670	> 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	671	> lasttool="merge3"
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	672	> 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	673	> 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	674	> 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	675	> 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	676	> 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	677	> 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	678	> 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	679	> 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	680	> 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	681	> fi
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	682	> lasttool="$tool"
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	683	> echo
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	684	> done
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	685	> }
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	686
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	687	$ testtransitions
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	688	=== :merge3 -> :local ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	689	(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	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	=== :local -> :other ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	694	(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	695	--- 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	696	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	697
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	698	=== :other -> :prompt ===
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	699	file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
39277 f785073f792c merge: improve interactive one-changed one-deleted message (issue5550) Augie Fackler <augie@google.com> parents: 35704 diff changeset	700	What do you want to do?
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	701	use (c)hanged version, (d)elete, or leave (u)nresolved?
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	702	file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
39277 f785073f792c merge: improve interactive one-changed one-deleted message (issue5550) Augie Fackler <augie@google.com> parents: 35704 diff changeset	703	What do you want to do?
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	704	use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
32253 7d4ce4b567c5 filemerge: show warning about choice of :prompt only at an actual fallback FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 30460 diff changeset	705	keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3?
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	706	--- 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	707	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	708
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	709	=== :prompt -> :local ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	710	(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	711	--- 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	712	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	713
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	714	=== :local -> :fail ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	715	--- 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	716	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	717
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	718	=== :fail -> :other ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	719	(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	720	--- 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	721	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	722
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	723	=== :other -> :local ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	724	(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	725	--- 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	726	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	727
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	728	=== :local -> :prompt ===
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	729	file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
39277 f785073f792c merge: improve interactive one-changed one-deleted message (issue5550) Augie Fackler <augie@google.com> parents: 35704 diff changeset	730	What do you want to do?
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	731	use (c)hanged version, (d)elete, or leave (u)nresolved?
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	732	file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
39277 f785073f792c merge: improve interactive one-changed one-deleted message (issue5550) Augie Fackler <augie@google.com> parents: 35704 diff changeset	733	What do you want to do?
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	734	use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
32253 7d4ce4b567c5 filemerge: show warning about choice of :prompt only at an actual fallback FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 30460 diff changeset	735	keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3?
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	736	--- 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	737	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	738
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	739	=== :prompt -> :other ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	740	(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	741	--- 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	742	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	743
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	744	=== :other -> :fail ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	745	--- 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	746	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	747
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	748	=== :fail -> :prompt ===
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	749	file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
39277 f785073f792c merge: improve interactive one-changed one-deleted message (issue5550) Augie Fackler <augie@google.com> parents: 35704 diff changeset	750	What do you want to do?
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	751	use (c)hanged version, (d)elete, or leave (u)nresolved?
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	752	file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
39277 f785073f792c merge: improve interactive one-changed one-deleted message (issue5550) Augie Fackler <augie@google.com> parents: 35704 diff changeset	753	What do you want to do?
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	754	use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
32253 7d4ce4b567c5 filemerge: show warning about choice of :prompt only at an actual fallback FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 30460 diff changeset	755	keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3?
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	756	--- 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	757	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	758
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	759	=== :prompt -> :fail ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	760	--- 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	761	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	762
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	763	=== :fail -> :local ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	764	(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	765	--- 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	766	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	767
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	768
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	769
26850 00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 22589 diff changeset	770	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	771
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 22589 diff changeset	772	$ 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	773	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	774	$ 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	775	$ 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	776	$ hg update 1 -y
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	777	file 'file1' was deleted in other [destination] but was modified in local [working copy].
39277 f785073f792c merge: improve interactive one-changed one-deleted message (issue5550) Augie Fackler <augie@google.com> parents: 35704 diff changeset	778	What do you want to do?
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	779	use (c)hanged version, (d)elete, or leave (u)nresolved? u
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	780	file 'file2' was deleted in local [working copy] but was modified in other [destination].
39277 f785073f792c merge: improve interactive one-changed one-deleted message (issue5550) Augie Fackler <augie@google.com> parents: 35704 diff changeset	781	What do you want to do?
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	782	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	783	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	784	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	785	[1]
26850 00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 22589 diff changeset	786	$ status
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 22589 diff changeset	787	--- status ---
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 22589 diff changeset	788	A file1
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 22589 diff changeset	789	C file2
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	790	C file3
27126 72b4e1bf8f28 test-merge-changedelete.t: add resolve --list output Siddharth Agarwal <sid0@fb.com> parents: 27125 diff changeset	791	--- resolve --list ---
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	792	U file1
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	793	U file2
27136 29b08ca680b0 test-merge-changedelete.t: print out debugmergestate Siddharth Agarwal <sid0@fb.com> parents: 27126 diff changeset	794	--- debugmergestate ---
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	795	* 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	796	local: ab57bf49aa276a22d35a473592d4c34b5abc3eff
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	797	other: 10f9a0a634e82080907e62f075ab119cbc565ea6
28634 3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28029 diff changeset	798	labels:
3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28029 diff changeset	799	local: working copy
3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28029 diff changeset	800	other: destination
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	801	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	802	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	803	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	804	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	805	other path: file1 (node null)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	806	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	807	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	808	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	809	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	810	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	811	--- file1 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	812	1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	813	changed
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	814	--- file2 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	815	2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	816	changed
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	817	--- file3 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	818	3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	819	changed1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	820
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	821	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	822
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	823	$ 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	824	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	825	$ 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	826	$ 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	827	$ 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	828	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	829	$ 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	830	--- status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	831	file2: * (glob)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	832	A file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	833	C file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	834	--- resolve --list ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	835	R file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	836	R file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	837	--- debugmergestate ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	838	* 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	839	local: ab57bf49aa276a22d35a473592d4c34b5abc3eff
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	840	other: 10f9a0a634e82080907e62f075ab119cbc565ea6
28634 3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28029 diff changeset	841	labels:
3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28029 diff changeset	842	local: working copy
3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28029 diff changeset	843	other: destination
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	844	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	845	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	846	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	847	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	848	other path: file1 (node null)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	849	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	850	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	851	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	852	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	853	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	854	--- file1 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	855	1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	856	changed
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	857	*** 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	858	--- file3 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	859	3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	860	changed1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	861
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	862	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	863
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	864	$ 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	865	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	866	$ 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	867	$ 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	868	$ 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	869	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	870	$ 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	871	--- status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	872	file1: * (glob)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	873	C file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	874	C file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	875	--- resolve --list ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	876	R file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	877	R file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	878	--- debugmergestate ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	879	* 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	880	local: ab57bf49aa276a22d35a473592d4c34b5abc3eff
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	881	other: 10f9a0a634e82080907e62f075ab119cbc565ea6
28634 3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28029 diff changeset	882	labels:
3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28029 diff changeset	883	local: working copy
3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28029 diff changeset	884	other: destination
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	885	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	886	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	887	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	888	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	889	other path: file1 (node null)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	890	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	891	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	892	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	893	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	894	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	895	*** 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	896	--- file2 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	897	2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	898	changed
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	899	--- file3 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	900	3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	901	changed1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	902
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	903	Fail
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	904
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	905	$ 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	906	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	907	$ 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	908	$ 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	909	$ 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	910	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	911	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	912	[1]
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	913	$ 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	914	--- status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	915	A file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	916	C file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	917	C file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	918	--- resolve --list ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	919	U file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	920	U file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	921	--- debugmergestate ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	922	* 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	923	local: ab57bf49aa276a22d35a473592d4c34b5abc3eff
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	924	other: 10f9a0a634e82080907e62f075ab119cbc565ea6
28634 3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28029 diff changeset	925	labels:
3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28029 diff changeset	926	local: working copy
3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28029 diff changeset	927	other: destination
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	928	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	929	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	930	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	931	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	932	other path: file1 (node null)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	933	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	934	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	935	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	936	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	937	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	938	--- file1 ---
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 22589 diff changeset	939	1
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 22589 diff changeset	940	changed
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 22589 diff changeset	941	--- file2 ---
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 22589 diff changeset	942	2
00209e38e7d9 test-merge-prompt.t: add tests for linear updates + change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 22589 diff changeset	943	changed
27125 969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	944	--- file3 ---
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	945	3
969ca40cad1d test-merge-changedelete.t: add a file with regular merge conflicts Siddharth Agarwal <sid0@fb.com> parents: 26947 diff changeset	946	changed1
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	947
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	948	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	949
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	950	$ 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	951	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	952	$ 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	953	$ 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	954	$ hg update 1 --config ui.interactive=True --tool :prompt
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	955	file 'file1' was deleted in other [destination] but was modified in local [working copy].
39277 f785073f792c merge: improve interactive one-changed one-deleted message (issue5550) Augie Fackler <augie@google.com> parents: 35704 diff changeset	956	What do you want to do?
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	957	use (c)hanged version, (d)elete, or leave (u)nresolved?
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	958	file 'file2' was deleted in local [working copy] but was modified in other [destination].
39277 f785073f792c merge: improve interactive one-changed one-deleted message (issue5550) Augie Fackler <augie@google.com> parents: 35704 diff changeset	959	What do you want to do?
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	960	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	961	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	962	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	963	[1]
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	964	$ 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	965	--- status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	966	A file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	967	C file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	968	C file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	969	--- resolve --list ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	970	U file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	971	U file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	972	--- debugmergestate ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	973	* 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	974	local: ab57bf49aa276a22d35a473592d4c34b5abc3eff
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	975	other: 10f9a0a634e82080907e62f075ab119cbc565ea6
28634 3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28029 diff changeset	976	labels:
3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28029 diff changeset	977	local: working copy
3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28029 diff changeset	978	other: destination
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	979	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	980	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	981	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	982	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	983	other path: file1 (node null)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	984	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	985	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	986	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	987	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	988	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	989	--- file1 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	990	1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	991	changed
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	992	--- file2 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	993	2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	994	changed
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	995	--- file3 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	996	3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	997	changed1
27557 28b5c4fcf48d tests: Solaris diff -U also emits "No differences encountered" Danek Duvall <danek.duvall@oracle.com> parents: 27164 diff changeset	998	$ 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	999
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1000	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	1001
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1002	$ 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	1003	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	1004	$ 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	1005	$ 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	1006	$ hg update 1 --tool :merge3
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	1007	file 'file1' was deleted in other [destination] but was modified in local [working copy].
39277 f785073f792c merge: improve interactive one-changed one-deleted message (issue5550) Augie Fackler <augie@google.com> parents: 35704 diff changeset	1008	What do you want to do?
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	1009	use (c)hanged version, (d)elete, or leave (u)nresolved? u
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	1010	file 'file2' was deleted in local [working copy] but was modified in other [destination].
39277 f785073f792c merge: improve interactive one-changed one-deleted message (issue5550) Augie Fackler <augie@google.com> parents: 35704 diff changeset	1011	What do you want to do?
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	1012	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	1013	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	1014	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	1015	[1]
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1016	$ status
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1017	--- status ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1018	A file1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1019	C file2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1020	C file3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1021	--- resolve --list ---
27599 ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	1022	U file1
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC) Siddharth Agarwal <sid0@fb.com> parents: 27557 diff changeset	1023	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	1024	--- debugmergestate ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1025	* 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	1026	local: ab57bf49aa276a22d35a473592d4c34b5abc3eff
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1027	other: 10f9a0a634e82080907e62f075ab119cbc565ea6
28634 3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28029 diff changeset	1028	labels:
3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28029 diff changeset	1029	local: working copy
3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28029 diff changeset	1030	other: destination
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	1031	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	1032	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	1033	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	1034	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	1035	other path: file1 (node null)
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 27599 diff changeset	1036	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	1037	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	1038	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	1039	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	1040	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	1041	--- file1 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1042	1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1043	changed
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1044	--- file2 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1045	2
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1046	changed
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1047	--- file3 ---
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1048	3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1049	changed1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1050
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1051	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	1052
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1053	$ testtransitions
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1054	=== :merge3 -> :local ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1055	(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	1056	--- 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	1057	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1058
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1059	=== :local -> :other ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1060	(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	1061	--- 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	1062	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1063
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1064	=== :other -> :prompt ===
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	1065	file 'file1' was deleted in other [destination] but was modified in local [working copy].
39277 f785073f792c merge: improve interactive one-changed one-deleted message (issue5550) Augie Fackler <augie@google.com> parents: 35704 diff changeset	1066	What do you want to do?
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	1067	use (c)hanged version, (d)elete, or leave (u)nresolved?
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	1068	file 'file2' was deleted in local [working copy] but was modified in other [destination].
39277 f785073f792c merge: improve interactive one-changed one-deleted message (issue5550) Augie Fackler <augie@google.com> parents: 35704 diff changeset	1069	What do you want to do?
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	1070	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	1071	--- 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	1072	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1073
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1074	=== :prompt -> :local ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1075	(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	1076	--- 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	1077	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1078
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1079	=== :local -> :fail ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1080	--- 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	1081	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1082
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1083	=== :fail -> :other ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1084	(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	1085	--- 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	1086	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1087
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1088	=== :other -> :local ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1089	(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	1090	--- 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	1091	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1092
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1093	=== :local -> :prompt ===
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	1094	file 'file1' was deleted in other [destination] but was modified in local [working copy].
39277 f785073f792c merge: improve interactive one-changed one-deleted message (issue5550) Augie Fackler <augie@google.com> parents: 35704 diff changeset	1095	What do you want to do?
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	1096	use (c)hanged version, (d)elete, or leave (u)nresolved?
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	1097	file 'file2' was deleted in local [working copy] but was modified in other [destination].
39277 f785073f792c merge: improve interactive one-changed one-deleted message (issue5550) Augie Fackler <augie@google.com> parents: 35704 diff changeset	1098	What do you want to do?
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	1099	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	1100	--- 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	1101	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1102
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1103	=== :prompt -> :other ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1104	(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	1105	--- 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	1106	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1107
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1108	=== :other -> :fail ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1109	--- 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	1110	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1111
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1112	=== :fail -> :prompt ===
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	1113	file 'file1' was deleted in other [destination] but was modified in local [working copy].
39277 f785073f792c merge: improve interactive one-changed one-deleted message (issue5550) Augie Fackler <augie@google.com> parents: 35704 diff changeset	1114	What do you want to do?
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	1115	use (c)hanged version, (d)elete, or leave (u)nresolved?
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	1116	file 'file2' was deleted in local [working copy] but was modified in other [destination].
39277 f785073f792c merge: improve interactive one-changed one-deleted message (issue5550) Augie Fackler <augie@google.com> parents: 35704 diff changeset	1117	What do you want to do?
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	1118	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	1119	--- 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	1120	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1121
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1122	=== :prompt -> :fail ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1123	--- 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	1124	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1125
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1126	=== :fail -> :local ===
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1127	(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	1128	--- 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	1129	(status identical)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27136 diff changeset	1130

author	Pulkit Goyal <pulkit@yandex-team.ru>
	Sun, 26 Aug 2018 19:14:26 +0300
changeset 39285	a3fd84f4fb38
parent 39284	975d959295ef
child 42565	4764e8436b2a
permissions	-rw-r--r--