mercurial: tests/test-merge-force.t@25e4b2f000c5 (annotated)

23449 eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	1	Set up a base, local, and remote changeset, as well as the working copy state.
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	2	Files names are of the form base_remote_local_working-copy. For example,
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	3	content1_content2_content1_content2-untracked represents a
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	4	file that was modified in the remote changeset, left untouched in the
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	5	local changeset, and then modified in the working copy to match the
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	6	remote content, then finally forgotten.
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	7
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	8	$ hg init repo
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	9	$ cd repo
6255 ae83d927c629 add a test for a375ffc2aa1b Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	10
23449 eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	11	Create base changeset
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	12
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	13	$ python $TESTDIR/generate-working-copy-states.py state 3 1
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	14	$ hg addremove -q --similarity 0
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	15	$ hg commit -qm 'base'
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	16
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	17	Create remote changeset
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	18
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	19	$ python $TESTDIR/generate-working-copy-states.py state 3 2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	20	$ hg addremove -q --similarity 0
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	21	$ hg commit -qm 'remote'
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	22
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	23	Create local changeset
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	24
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	25	$ hg update -q 0
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	26	$ python $TESTDIR/generate-working-copy-states.py state 3 3
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	27	$ hg addremove -q --similarity 0
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	28	$ hg commit -qm 'local'
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	29
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	30	Set up working directory
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	31
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	32	$ python $TESTDIR/generate-working-copy-states.py state 3 wc
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	33	$ hg addremove -q --similarity 0
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	34	$ hg forget ___-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	35	$ rm ___missing-
12256 2a06cb547be8 tests: unify test-merge-force Adrian Buehlmann <adrian@cadifra.com> parents: 6256 diff changeset	36
23449 eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	37	$ hg status -A
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	38	M content1_content1_content1_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	39	M content1_content1_content3_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	40	M content1_content1_content3_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	41	M content1_content2_content1_content2-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	42	M content1_content2_content1_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	43	M content1_content2_content2_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	44	M content1_content2_content2_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	45	M content1_content2_content3_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	46	M content1_content2_content3_content2-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	47	M content1_content2_content3_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	48	M content1_missing_content1_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	49	M content1_missing_content3_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	50	M content1_missing_content3_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	51	M missing_content2_content2_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	52	M missing_content2_content3_content2-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	53	M missing_content2_content3_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	54	M missing_missing_content3_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	55	A content1_content1_missing_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	56	A content1_content1_missing_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	57	A content1_content2_missing_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	58	A content1_content2_missing_content2-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	59	A content1_content2_missing_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	60	A content1_missing_missing_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	61	A content1_missing_missing_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	62	A missing_content2_missing_content2-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	63	A missing_content2_missing_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	64	A missing_missing_missing_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	65	R content1_content1_content1_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	66	R content1_content1_content1_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	67	R content1_content1_content1_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	68	R content1_content1_content3_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	69	R content1_content1_content3_content3-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	70	R content1_content1_content3_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	71	R content1_content1_content3_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	72	R content1_content2_content1_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	73	R content1_content2_content1_content2-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	74	R content1_content2_content1_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	75	R content1_content2_content1_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	76	R content1_content2_content2_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	77	R content1_content2_content2_content2-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	78	R content1_content2_content2_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	79	R content1_content2_content2_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	80	R content1_content2_content3_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	81	R content1_content2_content3_content2-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	82	R content1_content2_content3_content3-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	83	R content1_content2_content3_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	84	R content1_content2_content3_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	85	R content1_missing_content1_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	86	R content1_missing_content1_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	87	R content1_missing_content1_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	88	R content1_missing_content3_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	89	R content1_missing_content3_content3-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	90	R content1_missing_content3_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	91	R content1_missing_content3_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	92	R missing_content2_content2_content2-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	93	R missing_content2_content2_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	94	R missing_content2_content2_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	95	R missing_content2_content3_content2-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	96	R missing_content2_content3_content3-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	97	R missing_content2_content3_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	98	R missing_content2_content3_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	99	R missing_missing_content3_content3-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	100	R missing_missing_content3_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	101	R missing_missing_content3_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	102	! content1_content1_content1_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	103	! content1_content1_content3_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	104	! content1_content1_missing_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	105	! content1_content2_content1_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	106	! content1_content2_content2_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	107	! content1_content2_content3_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	108	! content1_content2_missing_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	109	! content1_missing_content1_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	110	! content1_missing_content3_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	111	! content1_missing_missing_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	112	! missing_content2_content2_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	113	! missing_content2_content3_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	114	! missing_content2_missing_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	115	! missing_missing_content3_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	116	! missing_missing_missing_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	117	? content1_content1_missing_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	118	? content1_content1_missing_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	119	? content1_content2_missing_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	120	? content1_content2_missing_content2-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	121	? content1_content2_missing_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	122	? content1_missing_missing_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	123	? content1_missing_missing_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	124	? missing_content2_missing_content2-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	125	? missing_content2_missing_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	126	? missing_missing_missing_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	127	C content1_content1_content1_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	128	C content1_content1_content3_content3-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	129	C content1_content2_content1_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	130	C content1_content2_content2_content2-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	131	C content1_content2_content3_content3-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	132	C content1_missing_content1_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	133	C content1_missing_content3_content3-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	134	C missing_content2_content2_content2-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	135	C missing_content2_content3_content3-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	136	C missing_missing_content3_content3-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	137
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	138	Merge with remote
6255 ae83d927c629 add a test for a375ffc2aa1b Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	139
23449 eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	140	# Notes:
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	141	# - local and remote changed content1_content2_*_content2-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	142	# in the same way, so it could potentially be left alone
6255 ae83d927c629 add a test for a375ffc2aa1b Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	143
23449 eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	144	$ hg merge -f --tool internal:merge3 'desc("remote")'
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	145	local changed content1_missing_content1_content4-tracked which remote deleted
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	146	use (c)hanged version or (d)elete? c
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	147	local changed content1_missing_content3_content3-tracked which remote deleted
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	148	use (c)hanged version or (d)elete? c
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	149	local changed content1_missing_content3_content4-tracked which remote deleted
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	150	use (c)hanged version or (d)elete? c
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	151	local changed content1_missing_missing_content4-tracked which remote deleted
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	152	use (c)hanged version or (d)elete? c
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	153	remote changed content1_content2_content1_content1-untracked which local deleted
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	154	use (c)hanged version or leave (d)eleted? c
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	155	remote changed content1_content2_content1_content2-untracked which local deleted
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	156	use (c)hanged version or leave (d)eleted? c
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	157	remote changed content1_content2_content1_content4-untracked which local deleted
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	158	use (c)hanged version or leave (d)eleted? c
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	159	remote changed content1_content2_content1_missing-tracked which local deleted
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	160	use (c)hanged version or leave (d)eleted? c
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	161	remote changed content1_content2_content1_missing-untracked which local deleted
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	162	use (c)hanged version or leave (d)eleted? c
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	163	remote changed content1_content2_content2_content1-untracked which local deleted
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	164	use (c)hanged version or leave (d)eleted? c
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	165	remote changed content1_content2_content2_content2-untracked which local deleted
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	166	use (c)hanged version or leave (d)eleted? c
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	167	remote changed content1_content2_content2_content4-untracked which local deleted
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	168	use (c)hanged version or leave (d)eleted? c
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	169	remote changed content1_content2_content2_missing-tracked which local deleted
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	170	use (c)hanged version or leave (d)eleted? c
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	171	remote changed content1_content2_content2_missing-untracked which local deleted
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	172	use (c)hanged version or leave (d)eleted? c
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	173	remote changed content1_content2_content3_content1-untracked which local deleted
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	174	use (c)hanged version or leave (d)eleted? c
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	175	remote changed content1_content2_content3_content2-untracked which local deleted
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	176	use (c)hanged version or leave (d)eleted? c
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	177	remote changed content1_content2_content3_content3-untracked which local deleted
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	178	use (c)hanged version or leave (d)eleted? c
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	179	remote changed content1_content2_content3_content4-untracked which local deleted
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	180	use (c)hanged version or leave (d)eleted? c
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	181	remote changed content1_content2_content3_missing-tracked which local deleted
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	182	use (c)hanged version or leave (d)eleted? c
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	183	remote changed content1_content2_content3_missing-untracked which local deleted
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	184	use (c)hanged version or leave (d)eleted? c
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	185	remote changed content1_content2_missing_content1-untracked which local deleted
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	186	use (c)hanged version or leave (d)eleted? c
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	187	remote changed content1_content2_missing_content2-untracked which local deleted
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	188	use (c)hanged version or leave (d)eleted? c
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	189	remote changed content1_content2_missing_content4-untracked which local deleted
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	190	use (c)hanged version or leave (d)eleted? c
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	191	remote changed content1_content2_missing_missing-tracked which local deleted
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	192	use (c)hanged version or leave (d)eleted? c
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	193	remote changed content1_content2_missing_missing-untracked which local deleted
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	194	use (c)hanged version or leave (d)eleted? c
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	195	merging content1_content2_content1_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	196	merging content1_content2_content2_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	197	merging content1_content2_content2_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	198	merging content1_content2_content3_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	199	merging content1_content2_content3_content3-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	200	merging content1_content2_content3_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	201	merging content1_content2_missing_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	202	merging content1_content2_missing_content4-tracked
26618 8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC) Siddharth Agarwal <sid0@fb.com> parents: 26614 diff changeset	203	merging missing_content2_content2_content4-tracked
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC) Siddharth Agarwal <sid0@fb.com> parents: 26614 diff changeset	204	merging missing_content2_content3_content3-tracked
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC) Siddharth Agarwal <sid0@fb.com> parents: 26614 diff changeset	205	merging missing_content2_content3_content4-tracked
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC) Siddharth Agarwal <sid0@fb.com> parents: 26614 diff changeset	206	merging missing_content2_missing_content4-tracked
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC) Siddharth Agarwal <sid0@fb.com> parents: 26614 diff changeset	207	merging missing_content2_missing_content4-untracked
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC) Siddharth Agarwal <sid0@fb.com> parents: 26614 diff changeset	208	warning: conflicts while merging content1_content2_content1_content4-tracked! (edit, then use 'hg resolve --mark')
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC) Siddharth Agarwal <sid0@fb.com> parents: 26614 diff changeset	209	warning: conflicts while merging content1_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC) Siddharth Agarwal <sid0@fb.com> parents: 26614 diff changeset	210	warning: conflicts while merging content1_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC) Siddharth Agarwal <sid0@fb.com> parents: 26614 diff changeset	211	warning: conflicts while merging content1_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
26614 ef1eb6df7071 simplemerge: move conflict warning message to filemerge Siddharth Agarwal <sid0@fb.com> parents: 23543 diff changeset	212	warning: conflicts while merging content1_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
ef1eb6df7071 simplemerge: move conflict warning message to filemerge Siddharth Agarwal <sid0@fb.com> parents: 23543 diff changeset	213	warning: conflicts while merging missing_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
ef1eb6df7071 simplemerge: move conflict warning message to filemerge Siddharth Agarwal <sid0@fb.com> parents: 23543 diff changeset	214	warning: conflicts while merging missing_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
ef1eb6df7071 simplemerge: move conflict warning message to filemerge Siddharth Agarwal <sid0@fb.com> parents: 23543 diff changeset	215	warning: conflicts while merging missing_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
ef1eb6df7071 simplemerge: move conflict warning message to filemerge Siddharth Agarwal <sid0@fb.com> parents: 23543 diff changeset	216	warning: conflicts while merging missing_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
ef1eb6df7071 simplemerge: move conflict warning message to filemerge Siddharth Agarwal <sid0@fb.com> parents: 23543 diff changeset	217	warning: conflicts while merging missing_content2_missing_content4-untracked! (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: 27133 diff changeset	218	18 files updated, 28 files merged, 8 files removed, 10 files unresolved
23449 eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	219	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	220	[1]
12256 2a06cb547be8 tests: unify test-merge-force Adrian Buehlmann <adrian@cadifra.com> parents: 6256 diff changeset	221
23543 4dd8a6a1240d spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 23449 diff changeset	222	Check which files need to be resolved (should correspond to the output above).
23449 eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	223	This should be the files for which the base (1st filename segment), the remote
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	224	(2nd segment) and the working copy (4th segment) are all different.
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	225
23543 4dd8a6a1240d spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 23449 diff changeset	226	Interestingly, one untracked file got merged and added, which corresponds to the
23449 eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	227	odd 'if force and branchmerge and different' case in manifestmerge().
12256 2a06cb547be8 tests: unify test-merge-force Adrian Buehlmann <adrian@cadifra.com> parents: 6256 diff changeset	228
23449 eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	229	$ hg resolve -l
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	230	R content1_content2_content1_content1-untracked
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	231	R content1_content2_content1_content2-untracked
23449 eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	232	U content1_content2_content1_content4-tracked
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	233	R content1_content2_content1_content4-untracked
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	234	R content1_content2_content1_missing-tracked
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	235	R content1_content2_content1_missing-untracked
23449 eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	236	R content1_content2_content2_content1-tracked
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	237	R content1_content2_content2_content1-untracked
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	238	R content1_content2_content2_content2-untracked
23449 eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	239	U content1_content2_content2_content4-tracked
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	240	R content1_content2_content2_content4-untracked
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	241	R content1_content2_content2_missing-tracked
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	242	R content1_content2_content2_missing-untracked
23449 eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	243	R content1_content2_content3_content1-tracked
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	244	R content1_content2_content3_content1-untracked
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	245	R content1_content2_content3_content2-untracked
23449 eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	246	U content1_content2_content3_content3-tracked
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	247	R content1_content2_content3_content3-untracked
23449 eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	248	U content1_content2_content3_content4-tracked
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	249	R content1_content2_content3_content4-untracked
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	250	R content1_content2_content3_missing-tracked
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	251	R content1_content2_content3_missing-untracked
23449 eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	252	R content1_content2_missing_content1-tracked
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	253	R content1_content2_missing_content1-untracked
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	254	R content1_content2_missing_content2-untracked
23449 eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	255	U content1_content2_missing_content4-tracked
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	256	R content1_content2_missing_content4-untracked
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	257	R content1_content2_missing_missing-tracked
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	258	R content1_content2_missing_missing-untracked
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	259	R content1_missing_content1_content4-tracked
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	260	R content1_missing_content3_content3-tracked
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	261	R content1_missing_content3_content4-tracked
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	262	R content1_missing_missing_content4-tracked
23449 eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	263	U missing_content2_content2_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	264	U missing_content2_content3_content3-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	265	U missing_content2_content3_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	266	U missing_content2_missing_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	267	U missing_content2_missing_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	268
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	269	Check status and file content
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	270
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	271	Some files get added (e.g. content1_content2_content1_content1-untracked)
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	272
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	273	It is not intuitive that content1_content2_content1_content4-tracked gets
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	274	merged while content1_content2_content1_content4-untracked gets overwritten.
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	275	Any _content2_-untracked triggers the modified/deleted prompt and then gets
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	276	overwritten.
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	277
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	278	A lot of untracked files become tracked, for example
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	279	content1_content2_content2_content2-untracked.
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	280
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	281	*_missing_missing_missing-tracked is reported as removed ('R'), which
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	282	doesn't make sense since the file did not exist in the parent, but on the
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	283	other hand, merged-in additions are reported as modifications, which is
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	284	almost as strange.
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	285
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	286	missing_missing_content3_missing-tracked becomes removed ('R'), even though
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	287	the remote side did not touch the file
6255 ae83d927c629 add a test for a375ffc2aa1b Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	288
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	289	$ checkstatus() {
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	290	> for f in `python $TESTDIR/generate-working-copy-states.py filelist 3`
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	291	> do
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	292	> echo
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	293	> hg status -A $f
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	294	> if test -f $f
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	295	> then
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	296	> cat $f
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	297	> else
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	298	> echo '<missing>'
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	299	> fi
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	300	> done
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	301	> }
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	302	$ checkstatus 2>&1 \| tee $TESTTMP/status1
23449 eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	303
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	304	C content1_content1_content1_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	305	content1
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	306
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	307	R content1_content1_content1_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	308	content1
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	309
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	310	M content1_content1_content1_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	311	content4
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	312
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	313	R content1_content1_content1_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	314	content4
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	315
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	316	! content1_content1_content1_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	317	<missing>
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	318
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	319	R content1_content1_content1_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	320	<missing>
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	321
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	322	M content1_content1_content3_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	323	content1
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	324
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	325	R content1_content1_content3_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	326	content1
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	327
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	328	C content1_content1_content3_content3-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	329	content3
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	330
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	331	R content1_content1_content3_content3-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	332	content3
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	333
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	334	M content1_content1_content3_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	335	content4
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	336
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	337	R content1_content1_content3_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	338	content4
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	339
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	340	! content1_content1_content3_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	341	<missing>
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	342
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	343	R content1_content1_content3_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	344	<missing>
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	345
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	346	A content1_content1_missing_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	347	content1
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	348
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	349	? content1_content1_missing_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	350	content1
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	351
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	352	A content1_content1_missing_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	353	content4
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	354
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	355	? content1_content1_missing_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	356	content4
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	357
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	358	! content1_content1_missing_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	359	<missing>
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	360
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	361	content1_content1_missing_missing-untracked: * (glob)
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	362	<missing>
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	363
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	364	M content1_content2_content1_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	365	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	366
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	367	M content1_content2_content1_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	368	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	369
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	370	M content1_content2_content1_content2-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	371	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	372
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	373	M content1_content2_content1_content2-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	374	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	375
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	376	M content1_content2_content1_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	377	<<<<<<< local: 0447570f1af6 - test: local
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	378	content4
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	379	\|\|\|\|\|\|\| base
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	380	content1
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	381	=======
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	382	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	383	>>>>>>> other: 85100b8c675b - test: remote
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	384
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	385	M content1_content2_content1_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	386	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	387
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	388	M content1_content2_content1_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	389	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	390
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	391	M content1_content2_content1_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	392	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	393
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	394	M content1_content2_content2_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	395	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	396
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	397	M content1_content2_content2_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	398	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	399
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	400	C content1_content2_content2_content2-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	401	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	402
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	403	M content1_content2_content2_content2-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	404	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	405
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	406	M content1_content2_content2_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	407	<<<<<<< local: 0447570f1af6 - test: local
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	408	content4
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	409	\|\|\|\|\|\|\| base
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	410	content1
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	411	=======
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	412	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	413	>>>>>>> other: 85100b8c675b - test: remote
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	414
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	415	M content1_content2_content2_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	416	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	417
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	418	M content1_content2_content2_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	419	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	420
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	421	M content1_content2_content2_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	422	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	423
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	424	M content1_content2_content3_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	425	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	426
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	427	M content1_content2_content3_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	428	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	429
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	430	M content1_content2_content3_content2-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	431	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	432
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	433	M content1_content2_content3_content2-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	434	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	435
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	436	M content1_content2_content3_content3-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	437	<<<<<<< local: 0447570f1af6 - test: local
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	438	content3
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	439	\|\|\|\|\|\|\| base
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	440	content1
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	441	=======
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	442	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	443	>>>>>>> other: 85100b8c675b - test: remote
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	444
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	445	M content1_content2_content3_content3-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	446	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	447
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	448	M content1_content2_content3_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	449	<<<<<<< local: 0447570f1af6 - test: local
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	450	content4
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	451	\|\|\|\|\|\|\| base
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	452	content1
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	453	=======
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	454	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	455	>>>>>>> other: 85100b8c675b - test: remote
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	456
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	457	M content1_content2_content3_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	458	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	459
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	460	M content1_content2_content3_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	461	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	462
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	463	M content1_content2_content3_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	464	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	465
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	466	M content1_content2_missing_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	467	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	468
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	469	M content1_content2_missing_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	470	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	471
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	472	M content1_content2_missing_content2-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	473	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	474
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	475	M content1_content2_missing_content2-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	476	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	477
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	478	M content1_content2_missing_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	479	<<<<<<< local: 0447570f1af6 - test: local
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	480	content4
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	481	\|\|\|\|\|\|\| base
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	482	content1
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	483	=======
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	484	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	485	>>>>>>> other: 85100b8c675b - test: remote
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	486
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	487	M content1_content2_missing_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	488	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	489
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	490	M content1_content2_missing_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	491	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	492
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	493	M content1_content2_missing_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	494	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	495
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	496	R content1_missing_content1_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	497	<missing>
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	498
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	499	R content1_missing_content1_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	500	content1
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	501
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	502	M content1_missing_content1_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	503	content4
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	504
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	505	R content1_missing_content1_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	506	content4
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	507
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	508	R content1_missing_content1_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	509	<missing>
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	510
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	511	R content1_missing_content1_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	512	<missing>
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	513
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	514	R content1_missing_content3_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	515	<missing>
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	516
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	517	R content1_missing_content3_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	518	content1
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	519
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	520	C content1_missing_content3_content3-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	521	content3
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	522
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	523	R content1_missing_content3_content3-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	524	content3
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	525
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	526	M content1_missing_content3_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	527	content4
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	528
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	529	R content1_missing_content3_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	530	content4
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	531
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	532	R content1_missing_content3_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	533	<missing>
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	534
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	535	R content1_missing_content3_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	536	<missing>
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	537
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	538	R content1_missing_missing_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	539	<missing>
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	540
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	541	? content1_missing_missing_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	542	content1
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	543
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	544	A content1_missing_missing_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	545	content4
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	546
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	547	? content1_missing_missing_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	548	content4
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	549
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	550	R content1_missing_missing_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	551	<missing>
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	552
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	553	content1_missing_missing_missing-untracked: * (glob)
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	554	<missing>
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	555
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	556	C missing_content2_content2_content2-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	557	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	558
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	559	M missing_content2_content2_content2-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	560	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	561
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	562	M missing_content2_content2_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	563	<<<<<<< local: 0447570f1af6 - test: local
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	564	content4
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	565	\|\|\|\|\|\|\| base
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	566	=======
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	567	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	568	>>>>>>> other: 85100b8c675b - test: remote
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	569
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	570	M missing_content2_content2_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	571	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	572
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	573	M missing_content2_content2_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	574	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	575
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	576	M missing_content2_content2_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	577	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	578
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	579	M missing_content2_content3_content2-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	580	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	581
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	582	M missing_content2_content3_content2-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	583	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	584
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	585	M missing_content2_content3_content3-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	586	<<<<<<< local: 0447570f1af6 - test: local
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	587	content3
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	588	\|\|\|\|\|\|\| base
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	589	=======
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	590	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	591	>>>>>>> other: 85100b8c675b - test: remote
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	592
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	593	M missing_content2_content3_content3-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	594	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	595
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	596	M missing_content2_content3_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	597	<<<<<<< local: 0447570f1af6 - test: local
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	598	content4
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	599	\|\|\|\|\|\|\| base
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	600	=======
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	601	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	602	>>>>>>> other: 85100b8c675b - test: remote
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	603
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	604	M missing_content2_content3_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	605	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	606
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	607	M missing_content2_content3_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	608	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	609
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	610	M missing_content2_content3_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	611	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	612
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	613	M missing_content2_missing_content2-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	614	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	615
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	616	M missing_content2_missing_content2-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	617	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	618
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	619	M missing_content2_missing_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	620	<<<<<<< local: 0447570f1af6 - test: local
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	621	content4
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	622	\|\|\|\|\|\|\| base
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	623	=======
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	624	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	625	>>>>>>> other: 85100b8c675b - test: remote
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	626
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	627	M missing_content2_missing_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	628	<<<<<<< local: 0447570f1af6 - test: local
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	629	content4
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	630	\|\|\|\|\|\|\| base
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	631	=======
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	632	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	633	>>>>>>> other: 85100b8c675b - test: remote
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	634
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	635	M missing_content2_missing_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	636	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	637
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	638	M missing_content2_missing_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	639	content2
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	640
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	641	C missing_missing_content3_content3-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	642	content3
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	643
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	644	R missing_missing_content3_content3-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	645	content3
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	646
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	647	M missing_missing_content3_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	648	content4
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	649
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	650	R missing_missing_content3_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	651	content4
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	652
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	653	R missing_missing_content3_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	654	<missing>
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	655
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	656	R missing_missing_content3_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	657	<missing>
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	658
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	659	A missing_missing_missing_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	660	content4
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	661
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	662	? missing_missing_missing_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	663	content4
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	664
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	665	R missing_missing_missing_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	666	<missing>
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	667
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	668	missing_missing_missing_missing-untracked: * (glob)
eeecf29cc397 merge: add more thorough tests for --force Martin von Zweigbergk <martinvonz@google.com> parents: 19802 diff changeset	669	<missing>
27133 8dff49c34a67 test-merge-force.t: check .orig files separately Siddharth Agarwal <sid0@fb.com> parents: 26618 diff changeset	670
8dff49c34a67 test-merge-force.t: check .orig files separately Siddharth Agarwal <sid0@fb.com> parents: 26618 diff changeset	671	$ for f in `python $TESTDIR/generate-working-copy-states.py filelist 3`
8dff49c34a67 test-merge-force.t: check .orig files separately Siddharth Agarwal <sid0@fb.com> parents: 26618 diff changeset	672	> do
8dff49c34a67 test-merge-force.t: check .orig files separately Siddharth Agarwal <sid0@fb.com> parents: 26618 diff changeset	673	> if test -f ${f}.orig
8dff49c34a67 test-merge-force.t: check .orig files separately Siddharth Agarwal <sid0@fb.com> parents: 26618 diff changeset	674	> then
8dff49c34a67 test-merge-force.t: check .orig files separately Siddharth Agarwal <sid0@fb.com> parents: 26618 diff changeset	675	> echo ${f}.orig:
8dff49c34a67 test-merge-force.t: check .orig files separately Siddharth Agarwal <sid0@fb.com> parents: 26618 diff changeset	676	> cat ${f}.orig
8dff49c34a67 test-merge-force.t: check .orig files separately Siddharth Agarwal <sid0@fb.com> parents: 26618 diff changeset	677	> fi
8dff49c34a67 test-merge-force.t: check .orig files separately Siddharth Agarwal <sid0@fb.com> parents: 26618 diff changeset	678	> done
8dff49c34a67 test-merge-force.t: check .orig files separately Siddharth Agarwal <sid0@fb.com> parents: 26618 diff changeset	679	content1_content2_content1_content4-tracked.orig:
8dff49c34a67 test-merge-force.t: check .orig files separately Siddharth Agarwal <sid0@fb.com> parents: 26618 diff changeset	680	content4
8dff49c34a67 test-merge-force.t: check .orig files separately Siddharth Agarwal <sid0@fb.com> parents: 26618 diff changeset	681	content1_content2_content2_content4-tracked.orig:
8dff49c34a67 test-merge-force.t: check .orig files separately Siddharth Agarwal <sid0@fb.com> parents: 26618 diff changeset	682	content4
8dff49c34a67 test-merge-force.t: check .orig files separately Siddharth Agarwal <sid0@fb.com> parents: 26618 diff changeset	683	content1_content2_content3_content3-tracked.orig:
8dff49c34a67 test-merge-force.t: check .orig files separately Siddharth Agarwal <sid0@fb.com> parents: 26618 diff changeset	684	content3
8dff49c34a67 test-merge-force.t: check .orig files separately Siddharth Agarwal <sid0@fb.com> parents: 26618 diff changeset	685	content1_content2_content3_content4-tracked.orig:
8dff49c34a67 test-merge-force.t: check .orig files separately Siddharth Agarwal <sid0@fb.com> parents: 26618 diff changeset	686	content4
8dff49c34a67 test-merge-force.t: check .orig files separately Siddharth Agarwal <sid0@fb.com> parents: 26618 diff changeset	687	content1_content2_missing_content4-tracked.orig:
8dff49c34a67 test-merge-force.t: check .orig files separately Siddharth Agarwal <sid0@fb.com> parents: 26618 diff changeset	688	content4
8dff49c34a67 test-merge-force.t: check .orig files separately Siddharth Agarwal <sid0@fb.com> parents: 26618 diff changeset	689	missing_content2_content2_content4-tracked.orig:
8dff49c34a67 test-merge-force.t: check .orig files separately Siddharth Agarwal <sid0@fb.com> parents: 26618 diff changeset	690	content4
8dff49c34a67 test-merge-force.t: check .orig files separately Siddharth Agarwal <sid0@fb.com> parents: 26618 diff changeset	691	missing_content2_content3_content3-tracked.orig:
8dff49c34a67 test-merge-force.t: check .orig files separately Siddharth Agarwal <sid0@fb.com> parents: 26618 diff changeset	692	content3
8dff49c34a67 test-merge-force.t: check .orig files separately Siddharth Agarwal <sid0@fb.com> parents: 26618 diff changeset	693	missing_content2_content3_content4-tracked.orig:
8dff49c34a67 test-merge-force.t: check .orig files separately Siddharth Agarwal <sid0@fb.com> parents: 26618 diff changeset	694	content4
8dff49c34a67 test-merge-force.t: check .orig files separately Siddharth Agarwal <sid0@fb.com> parents: 26618 diff changeset	695	missing_content2_missing_content4-tracked.orig:
8dff49c34a67 test-merge-force.t: check .orig files separately Siddharth Agarwal <sid0@fb.com> parents: 26618 diff changeset	696	content4
8dff49c34a67 test-merge-force.t: check .orig files separately Siddharth Agarwal <sid0@fb.com> parents: 26618 diff changeset	697	missing_content2_missing_content4-untracked.orig:
8dff49c34a67 test-merge-force.t: check .orig files separately Siddharth Agarwal <sid0@fb.com> parents: 26618 diff changeset	698	content4
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	699
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	700	Re-resolve and check status
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	701
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	702	$ hg resolve --unmark --all
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	703	$ hg resolve --all --tool :local
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	704	(no more unresolved files)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	705	$ hg resolve --unmark --all
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	706	$ hg resolve --all --tool internal:merge3
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	707	remote changed content1_content2_content1_content1-untracked which local deleted
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	708	use (c)hanged version or leave (d)eleted? c
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	709	remote changed content1_content2_content1_content2-untracked which local deleted
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	710	use (c)hanged version or leave (d)eleted? c
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	711	merging content1_content2_content1_content4-tracked
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	712	remote changed content1_content2_content1_content4-untracked which local deleted
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	713	use (c)hanged version or leave (d)eleted? c
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	714	remote changed content1_content2_content1_missing-tracked which local deleted
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	715	use (c)hanged version or leave (d)eleted? c
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	716	remote changed content1_content2_content1_missing-untracked which local deleted
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	717	use (c)hanged version or leave (d)eleted? c
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	718	merging content1_content2_content2_content1-tracked
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	719	remote changed content1_content2_content2_content1-untracked which local deleted
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	720	use (c)hanged version or leave (d)eleted? c
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	721	remote changed content1_content2_content2_content2-untracked which local deleted
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	722	use (c)hanged version or leave (d)eleted? c
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	723	merging content1_content2_content2_content4-tracked
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	724	remote changed content1_content2_content2_content4-untracked which local deleted
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	725	use (c)hanged version or leave (d)eleted? c
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	726	remote changed content1_content2_content2_missing-tracked which local deleted
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	727	use (c)hanged version or leave (d)eleted? c
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	728	remote changed content1_content2_content2_missing-untracked which local deleted
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	729	use (c)hanged version or leave (d)eleted? c
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	730	merging content1_content2_content3_content1-tracked
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	731	remote changed content1_content2_content3_content1-untracked which local deleted
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	732	use (c)hanged version or leave (d)eleted? c
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	733	remote changed content1_content2_content3_content2-untracked which local deleted
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	734	use (c)hanged version or leave (d)eleted? c
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	735	merging content1_content2_content3_content3-tracked
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	736	remote changed content1_content2_content3_content3-untracked which local deleted
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	737	use (c)hanged version or leave (d)eleted? c
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	738	merging content1_content2_content3_content4-tracked
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	739	remote changed content1_content2_content3_content4-untracked which local deleted
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	740	use (c)hanged version or leave (d)eleted? c
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	741	remote changed content1_content2_content3_missing-tracked which local deleted
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	742	use (c)hanged version or leave (d)eleted? c
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	743	remote changed content1_content2_content3_missing-untracked which local deleted
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	744	use (c)hanged version or leave (d)eleted? c
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	745	merging content1_content2_missing_content1-tracked
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	746	remote changed content1_content2_missing_content1-untracked which local deleted
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	747	use (c)hanged version or leave (d)eleted? c
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	748	remote changed content1_content2_missing_content2-untracked which local deleted
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	749	use (c)hanged version or leave (d)eleted? c
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	750	merging content1_content2_missing_content4-tracked
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	751	remote changed content1_content2_missing_content4-untracked which local deleted
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	752	use (c)hanged version or leave (d)eleted? c
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	753	remote changed content1_content2_missing_missing-tracked which local deleted
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	754	use (c)hanged version or leave (d)eleted? c
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	755	remote changed content1_content2_missing_missing-untracked which local deleted
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	756	use (c)hanged version or leave (d)eleted? c
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	757	local changed content1_missing_content1_content4-tracked which remote deleted
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	758	use (c)hanged version or (d)elete? c
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	759	local changed content1_missing_content3_content3-tracked which remote deleted
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	760	use (c)hanged version or (d)elete? c
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	761	local changed content1_missing_content3_content4-tracked which remote deleted
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	762	use (c)hanged version or (d)elete? c
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	763	local changed content1_missing_missing_content4-tracked which remote deleted
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	764	use (c)hanged version or (d)elete? c
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	765	merging missing_content2_content2_content4-tracked
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	766	merging missing_content2_content3_content3-tracked
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	767	merging missing_content2_content3_content4-tracked
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	768	merging missing_content2_missing_content4-tracked
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	769	merging missing_content2_missing_content4-untracked
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	770	warning: conflicts while merging content1_content2_content1_content4-tracked! (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: 27133 diff changeset	771	warning: conflicts while merging content1_content2_content2_content4-tracked! (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: 27133 diff changeset	772	warning: conflicts while merging content1_content2_content3_content3-tracked! (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: 27133 diff changeset	773	warning: conflicts while merging content1_content2_content3_content4-tracked! (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: 27133 diff changeset	774	warning: conflicts while merging content1_content2_missing_content4-tracked! (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: 27133 diff changeset	775	warning: conflicts while merging missing_content2_content2_content4-tracked! (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: 27133 diff changeset	776	warning: conflicts while merging missing_content2_content3_content3-tracked! (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: 27133 diff changeset	777	warning: conflicts while merging missing_content2_content3_content4-tracked! (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: 27133 diff changeset	778	warning: conflicts while merging missing_content2_missing_content4-tracked! (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: 27133 diff changeset	779	warning: conflicts while merging missing_content2_missing_content4-untracked! (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: 27133 diff changeset	780	[1]
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	781	$ checkstatus > $TESTTMP/status2 2>&1
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27133 diff changeset	782	$ diff -U8 $TESTTMP/status1 $TESTTMP/status2

author	Siddharth Agarwal <sid0@fb.com>
	Wed, 25 Nov 2015 14:25:33 -0800
changeset 27137	25e4b2f000c5
parent 27133	8dff49c34a67
child 27163	27b89a0957ec
permissions	-rw-r--r--