mercurial: tests/test-merge-changedelete.t@64461b43a7bf (annotated)

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

author	Pulkit Goyal <7895pulkit@gmail.com>
	Wed, 30 Sep 2020 15:09:25 +0530
changeset 45616	64461b43a7bf
parent 45584	4c8a93ec6908
child 46811	5a0b930cfb3e
permissions	-rw-r--r--