mercurial: tests/test-copies-chain-merge.t@4ffe502673c3 (annotated)

45704 5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1	#testcases filelog compatibility changeset sidedata
44758 45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	2
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	3	=====================================================
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	4	Test Copy tracing for chain of copies involving merge
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	5	=====================================================
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	6
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	7	This test files covers copies/rename case for a chains of commit where merges
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	8	are involved. It cheks we do not have unwanted update of behavior and that the
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	9	different options to retrieve copies behave correctly.
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	10
44758 45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	11
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	12	Setup
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	13	=====
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	14
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	15	use git diff to see rename
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	16
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	17	$ cat << EOF >> $HGRCPATH
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	18	> [diff]
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	19	> git=yes
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	20	> [ui]
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	21	> logtemplate={rev} {desc}\n
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	22	> EOF
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	23
44758 45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	24	#if compatibility
45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	25	$ cat >> $HGRCPATH << EOF
45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	26	> [experimental]
45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	27	> copies.read-from = compatibility
45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	28	> EOF
45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	29	#endif
45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	30
45704 5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	31	#if changeset
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	32	$ cat >> $HGRCPATH << EOF
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	33	> [experimental]
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	34	> copies.read-from = changeset-only
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	35	> copies.write-to = changeset-only
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	36	> EOF
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	37	#endif
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	38
44758 45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	39	#if sidedata
45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	40	$ cat >> $HGRCPATH << EOF
45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	41	> [format]
45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	42	> exp-use-side-data = yes
45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	43	> exp-use-copies-side-data-changeset = yes
45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	44	> EOF
45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	45	#endif
45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	46
45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	47
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	48	$ hg init repo-chain
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	49	$ cd repo-chain
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	50
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	51	Add some linear rename initialy
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	52
45702 deeb215be337 tests: update test-copies-chain-merge.t to not use empty files Martin von Zweigbergk <martinvonz@google.com> parents: 45670 diff changeset	53	$ echo a > a
deeb215be337 tests: update test-copies-chain-merge.t to not use empty files Martin von Zweigbergk <martinvonz@google.com> parents: 45670 diff changeset	54	$ echo b > b
deeb215be337 tests: update test-copies-chain-merge.t to not use empty files Martin von Zweigbergk <martinvonz@google.com> parents: 45670 diff changeset	55	$ echo h > h
44457 902b559202a6 copies-tests: add a `h` to the root commit (for chain merge tests) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44456 diff changeset	56	$ hg ci -Am 'i-0 initial commit: a b h'
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	57	adding a
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	58	adding b
44457 902b559202a6 copies-tests: add a `h` to the root commit (for chain merge tests) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44456 diff changeset	59	adding h
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	60	$ hg mv a c
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	61	$ hg ci -Am 'i-1: a -move-> c'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	62	$ hg mv c d
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	63	$ hg ci -Am 'i-2: c -move-> d'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	64	$ hg log -G
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	65	@ 2 i-2: c -move-> d
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	66	\|
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	67	o 1 i-1: a -move-> c
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	68	\|
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	69	o 0 i-0 initial commit: a b h
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	70
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	71
44453 68e14fecd82a copies-tests: swap two branch description Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44444 diff changeset	72	And having another branch with renames on the other side
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	73
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	74	$ hg mv d e
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	75	$ hg ci -Am 'a-1: d -move-> e'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	76	$ hg mv e f
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	77	$ hg ci -Am 'a-2: e -move-> f'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	78	$ hg log -G --rev '::.'
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	79	@ 4 a-2: e -move-> f
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	80	\|
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	81	o 3 a-1: d -move-> e
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	82	\|
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	83	o 2 i-2: c -move-> d
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	84	\|
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	85	o 1 i-1: a -move-> c
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	86	\|
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	87	o 0 i-0 initial commit: a b h
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	88
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	89
44453 68e14fecd82a copies-tests: swap two branch description Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44444 diff changeset	90	Have a branching with nothing on one side
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	91
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	92	$ hg up 'desc("i-2")'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	93	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	94	$ echo foo > b
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	95	$ hg ci -m 'b-1: b update'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	96	created new head
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	97	$ hg log -G --rev '::.'
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	98	@ 5 b-1: b update
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	99	\|
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	100	o 2 i-2: c -move-> d
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	101	\|
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	102	o 1 i-1: a -move-> c
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	103	\|
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	104	o 0 i-0 initial commit: a b h
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	105
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	106
44677 4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	107	Create a branch that delete a file previous renamed
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	108
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	109	$ hg up 'desc("i-2")'
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	110	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	111	$ hg rm d
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	112	$ hg ci -m 'c-1 delete d'
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	113	created new head
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	114	$ hg log -G --rev '::.'
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	115	@ 6 c-1 delete d
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	116	\|
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	117	o 2 i-2: c -move-> d
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	118	\|
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	119	o 1 i-1: a -move-> c
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	120	\|
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	121	o 0 i-0 initial commit: a b h
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	122
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	123
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	124	Create a branch that delete a file previous renamed and recreate it
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	125
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	126	$ hg up 'desc("i-2")'
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	127	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	128	$ hg rm d
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	129	$ hg ci -m 'd-1 delete d'
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	130	created new head
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	131	$ echo bar > d
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	132	$ hg add d
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	133	$ hg ci -m 'd-2 re-add d'
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	134	$ hg log -G --rev '::.'
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	135	@ 8 d-2 re-add d
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	136	\|
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	137	o 7 d-1 delete d
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	138	\|
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	139	o 2 i-2: c -move-> d
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	140	\|
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	141	o 1 i-1: a -move-> c
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	142	\|
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	143	o 0 i-0 initial commit: a b h
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	144
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	145
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	146	Having another branch renaming a different file to the same filename as another
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	147
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	148	$ hg up 'desc("i-2")'
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	149	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	150	$ hg mv b g
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	151	$ hg ci -m 'e-1 b -move-> g'
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	152	created new head
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	153	$ hg mv g f
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	154	$ hg ci -m 'e-2 g -move-> f'
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	155	$ hg log -G --rev '::.'
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	156	@ 10 e-2 g -move-> f
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	157	\|
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	158	o 9 e-1 b -move-> g
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	159	\|
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	160	o 2 i-2: c -move-> d
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	161	\|
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	162	o 1 i-1: a -move-> c
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	163	\|
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	164	o 0 i-0 initial commit: a b h
4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	165
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	166
45732 4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	167	Setup all merge
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	168	===============
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	169
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	170	This is done beforehand to validate that the upgrade process creates valid copy
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	171	information.
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	172
44678 806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	173	merging with unrelated change does not interfere with the renames
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	174	---------------------------------------------------------------
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	175
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	176	- rename on one side
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	177	- unrelated change on the other side
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	178
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	179	$ hg up 'desc("b-1")'
44677 4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	180	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	181	$ hg merge 'desc("a-2")'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	182	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	183	(branch merge, don't forget to commit)
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	184	$ hg ci -m 'mBAm-0 simple merge - one way'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	185	$ hg up 'desc("a-2")'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	186	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	187	$ hg merge 'desc("b-1")'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	188	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	189	(branch merge, don't forget to commit)
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	190	$ hg ci -m 'mABm-0 simple merge - the other way'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	191	created new head
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	192	$ hg log -G --rev '::(desc("mABm")+desc("mBAm"))'
44677 4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	193	@ 12 mABm-0 simple merge - the other way
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	194	\|\
44677 4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	195	+---o 11 mBAm-0 simple merge - one way
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	196	\| \|/
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	197	\| o 5 b-1: b update
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	198	\| \|
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	199	o \| 4 a-2: e -move-> f
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	200	\| \|
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	201	o \| 3 a-1: d -move-> e
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	202	\|/
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	203	o 2 i-2: c -move-> d
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	204	\|
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	205	o 1 i-1: a -move-> c
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	206	\|
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	207	o 0 i-0 initial commit: a b h
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	208
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	209
45732 4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	210
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	211	merging with the side having a delete
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	212	-------------------------------------
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	213
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	214	case summary:
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	215	- one with change to an unrelated file
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	216	- one deleting the change
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	217	and recreate an unrelated file after the merge
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	218
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	219	$ hg up 'desc("b-1")'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	220	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	221	$ hg merge 'desc("c-1")'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	222	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	223	(branch merge, don't forget to commit)
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	224	$ hg ci -m 'mBCm-0 simple merge - one way'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	225	$ echo bar > d
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	226	$ hg add d
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	227	$ hg ci -m 'mBCm-1 re-add d'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	228	$ hg up 'desc("c-1")'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	229	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	230	$ hg merge 'desc("b-1")'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	231	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	232	(branch merge, don't forget to commit)
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	233	$ hg ci -m 'mCBm-0 simple merge - the other way'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	234	created new head
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	235	$ echo bar > d
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	236	$ hg add d
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	237	$ hg ci -m 'mCBm-1 re-add d'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	238	$ hg log -G --rev '::(desc("mCBm")+desc("mBCm"))'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	239	@ 16 mCBm-1 re-add d
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	240	\|
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	241	o 15 mCBm-0 simple merge - the other way
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	242	\|\
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	243	\| \| o 14 mBCm-1 re-add d
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	244	\| \| \|
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	245	+---o 13 mBCm-0 simple merge - one way
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	246	\| \|/
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	247	\| o 6 c-1 delete d
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	248	\| \|
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	249	o \| 5 b-1: b update
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	250	\|/
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	251	o 2 i-2: c -move-> d
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	252	\|
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	253	o 1 i-1: a -move-> c
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	254	\|
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	255	o 0 i-0 initial commit: a b h
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	256
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	257
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	258	Comparing with a merge re-adding the file afterward
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	259	---------------------------------------------------
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	260
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	261	Merge:
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	262	- one with change to an unrelated file
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	263	- one deleting and recreating the change
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	264
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	265	$ hg up 'desc("b-1")'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	266	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	267	$ hg merge 'desc("d-2")'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	268	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	269	(branch merge, don't forget to commit)
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	270	$ hg ci -m 'mBDm-0 simple merge - one way'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	271	$ hg up 'desc("d-2")'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	272	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	273	$ hg merge 'desc("b-1")'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	274	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	275	(branch merge, don't forget to commit)
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	276	$ hg ci -m 'mDBm-0 simple merge - the other way'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	277	created new head
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	278	$ hg log -G --rev '::(desc("mDBm")+desc("mBDm"))'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	279	@ 18 mDBm-0 simple merge - the other way
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	280	\|\
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	281	+---o 17 mBDm-0 simple merge - one way
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	282	\| \|/
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	283	\| o 8 d-2 re-add d
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	284	\| \|
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	285	\| o 7 d-1 delete d
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	286	\| \|
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	287	o \| 5 b-1: b update
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	288	\|/
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	289	o 2 i-2: c -move-> d
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	290	\|
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	291	o 1 i-1: a -move-> c
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	292	\|
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	293	o 0 i-0 initial commit: a b h
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	294
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	295
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	296
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	297	Comparing with a merge with colliding rename
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	298	--------------------------------------------
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	299
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	300	- the "e-" branch renaming b to f (through 'g')
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	301	- the "a-" branch renaming d to f (through e)
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	302
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	303	$ hg up 'desc("a-2")'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	304	2 files updated, 0 files merged, 1 files removed, 0 files unresolved
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	305	$ hg merge 'desc("e-2")' --tool :union
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	306	merging f
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	307	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	308	(branch merge, don't forget to commit)
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	309	$ hg ci -m 'mAEm-0 simple merge - one way'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	310	$ hg up 'desc("e-2")'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	311	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	312	$ hg merge 'desc("a-2")' --tool :union
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	313	merging f
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	314	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	315	(branch merge, don't forget to commit)
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	316	$ hg ci -m 'mEAm-0 simple merge - the other way'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	317	created new head
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	318	$ hg log -G --rev '::(desc("mAEm")+desc("mEAm"))'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	319	@ 20 mEAm-0 simple merge - the other way
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	320	\|\
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	321	+---o 19 mAEm-0 simple merge - one way
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	322	\| \|/
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	323	\| o 10 e-2 g -move-> f
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	324	\| \|
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	325	\| o 9 e-1 b -move-> g
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	326	\| \|
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	327	o \| 4 a-2: e -move-> f
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	328	\| \|
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	329	o \| 3 a-1: d -move-> e
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	330	\|/
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	331	o 2 i-2: c -move-> d
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	332	\|
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	333	o 1 i-1: a -move-> c
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	334	\|
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	335	o 0 i-0 initial commit: a b h
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	336
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	337
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	338
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	339	Merge:
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	340	- one with change to an unrelated file (b)
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	341	- one overwriting a file (d) with a rename (from h to i to d)
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	342
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	343	$ hg up 'desc("i-2")'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	344	2 files updated, 0 files merged, 1 files removed, 0 files unresolved
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	345	$ hg mv h i
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	346	$ hg commit -m "f-1: rename h -> i"
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	347	created new head
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	348	$ hg mv --force i d
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	349	$ hg commit -m "f-2: rename i -> d"
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	350	$ hg debugindex d
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	351	rev linkrev nodeid p1 p2
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	352	0 2 169be882533b 000000000000 000000000000 (no-changeset !)
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	353	0 2 b789fdd96dc2 000000000000 000000000000 (changeset !)
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	354	1 8 b004912a8510 000000000000 000000000000
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	355	2 22 4a067cf8965d 000000000000 000000000000 (no-changeset !)
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	356	2 22 fe6f8b4f507f 000000000000 000000000000 (changeset !)
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	357	$ hg up 'desc("b-1")'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	358	3 files updated, 0 files merged, 0 files removed, 0 files unresolved
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	359	$ hg merge 'desc("f-2")'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	360	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	361	(branch merge, don't forget to commit)
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	362	$ hg ci -m 'mBFm-0 simple merge - one way'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	363	$ hg up 'desc("f-2")'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	364	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	365	$ hg merge 'desc("b-1")'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	366	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	367	(branch merge, don't forget to commit)
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	368	$ hg ci -m 'mFBm-0 simple merge - the other way'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	369	created new head
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	370	$ hg log -G --rev '::(desc("mBFm")+desc("mFBm"))'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	371	@ 24 mFBm-0 simple merge - the other way
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	372	\|\
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	373	+---o 23 mBFm-0 simple merge - one way
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	374	\| \|/
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	375	\| o 22 f-2: rename i -> d
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	376	\| \|
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	377	\| o 21 f-1: rename h -> i
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	378	\| \|
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	379	o \| 5 b-1: b update
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	380	\|/
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	381	o 2 i-2: c -move-> d
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	382	\|
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	383	o 1 i-1: a -move-> c
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	384	\|
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	385	o 0 i-0 initial commit: a b h
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	386
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	387
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	388
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	389	Merge:
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	390	- one with change to a file
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	391	- one deleting and recreating the file
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	392
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	393	Unlike in the 'BD/DB' cases, an actual merge happened here. So we should
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	394	consider history and rename on both branch of the merge.
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	395
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	396	$ hg up 'desc("i-2")'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	397	3 files updated, 0 files merged, 0 files removed, 0 files unresolved
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	398	$ echo "some update" >> d
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	399	$ hg commit -m "g-1: update d"
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	400	created new head
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	401	$ hg up 'desc("d-2")'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	402	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	403	$ hg merge 'desc("g-1")' --tool :union
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	404	merging d
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	405	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	406	(branch merge, don't forget to commit)
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	407	$ hg ci -m 'mDGm-0 simple merge - one way'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	408	$ hg up 'desc("g-1")'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	409	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	410	$ hg merge 'desc("d-2")' --tool :union
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	411	merging d
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	412	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	413	(branch merge, don't forget to commit)
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	414	$ hg ci -m 'mGDm-0 simple merge - the other way'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	415	created new head
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	416	$ hg log -G --rev '::(desc("mDGm")+desc("mGDm"))'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	417	@ 27 mGDm-0 simple merge - the other way
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	418	\|\
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	419	+---o 26 mDGm-0 simple merge - one way
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	420	\| \|/
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	421	\| o 25 g-1: update d
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	422	\| \|
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	423	o \| 8 d-2 re-add d
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	424	\| \|
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	425	o \| 7 d-1 delete d
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	426	\|/
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	427	o 2 i-2: c -move-> d
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	428	\|
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	429	o 1 i-1: a -move-> c
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	430	\|
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	431	o 0 i-0 initial commit: a b h
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	432
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	433
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	434
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	435	Merge:
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	436	- one with change to a file (d)
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	437	- one overwriting that file with a rename (from h to i, to d)
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	438
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	439	This case is similar to BF/FB, but an actual merge happens, so both side of the
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	440	history are relevant.
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	441
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	442	Note:
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	443	\| In this case, the merge get conflicting information since on one side we have
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	444	\| "a -> c -> d". and one the other one we have "h -> i -> d".
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	445	\|
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	446	\| The current code arbitrarily pick one side
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	447
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	448	$ hg up 'desc("f-2")'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	449	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	450	$ hg merge 'desc("g-1")' --tool :union
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	451	merging d
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	452	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	453	(branch merge, don't forget to commit)
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	454	$ hg ci -m 'mFGm-0 simple merge - one way'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	455	created new head
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	456	$ hg up 'desc("g-1")'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	457	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	458	$ hg merge 'desc("f-2")' --tool :union
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	459	merging d
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	460	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	461	(branch merge, don't forget to commit)
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	462	$ hg ci -m 'mGFm-0 simple merge - the other way'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	463	created new head
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	464	$ hg log -G --rev '::(desc("mGFm")+desc("mFGm"))'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	465	@ 29 mGFm-0 simple merge - the other way
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	466	\|\
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	467	+---o 28 mFGm-0 simple merge - one way
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	468	\| \|/
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	469	\| o 25 g-1: update d
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	470	\| \|
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	471	o \| 22 f-2: rename i -> d
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	472	\| \|
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	473	o \| 21 f-1: rename h -> i
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	474	\|/
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	475	o 2 i-2: c -move-> d
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	476	\|
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	477	o 1 i-1: a -move-> c
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	478	\|
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	479	o 0 i-0 initial commit: a b h
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	480
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	481
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	482
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	483	Comparing with merging with a deletion (and keeping the file)
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	484	-------------------------------------------------------------
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	485
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	486	Merge:
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	487	- one removing a file (d)
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	488	- one updating that file
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	489	- the merge keep the modified version of the file (canceling the delete)
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	490
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	491	In this case, the file keep on living after the merge. So we should not drop its
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	492	copy tracing chain.
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	493
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	494	$ hg up 'desc("c-1")'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	495	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	496	$ hg merge 'desc("g-1")'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	497	file 'd' was deleted in local [working copy] but was modified in other [merge rev].
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	498	You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	499	What do you want to do? u
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	500	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	501	use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	502	[1]
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	503	$ hg resolve -t :other d
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	504	(no more unresolved files)
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	505	$ hg ci -m "mCGm-0"
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	506	created new head
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	507
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	508	$ hg up 'desc("g-1")'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	509	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	510	$ hg merge 'desc("c-1")'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	511	file 'd' was deleted in other [merge rev] but was modified in local [working copy].
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	512	You can use (c)hanged version, (d)elete, or leave (u)nresolved.
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	513	What do you want to do? u
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	514	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	515	use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	516	[1]
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	517	$ hg resolve -t :local d
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	518	(no more unresolved files)
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	519	$ hg ci -m "mGCm-0"
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	520	created new head
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	521
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	522	$ hg log -G --rev '::(desc("mCGm")+desc("mGCm"))'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	523	@ 31 mGCm-0
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	524	\|\
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	525	+---o 30 mCGm-0
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	526	\| \|/
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	527	\| o 25 g-1: update d
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	528	\| \|
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	529	o \| 6 c-1 delete d
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	530	\|/
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	531	o 2 i-2: c -move-> d
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	532	\|
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	533	o 1 i-1: a -move-> c
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	534	\|
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	535	o 0 i-0 initial commit: a b h
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	536
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	537
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	538
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	539
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	540	Comparing with merge restoring an untouched deleted file
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	541	--------------------------------------------------------
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	542
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	543	Merge:
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	544	- one removing a file (d)
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	545	- one leaving the file untouched
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	546	- the merge actively restore the file to the same content.
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	547
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	548	In this case, the file keep on living after the merge. So we should not drop its
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	549	copy tracing chain.
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	550
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	551	$ hg up 'desc("c-1")'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	552	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	553	$ hg merge 'desc("b-1")'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	554	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	555	(branch merge, don't forget to commit)
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	556	$ hg revert --rev 'desc("b-1")' d
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	557	$ hg ci -m "mCB-revert-m-0"
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	558	created new head
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	559
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	560	$ hg up 'desc("b-1")'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	561	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	562	$ hg merge 'desc("c-1")'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	563	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	564	(branch merge, don't forget to commit)
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	565	$ hg revert --rev 'desc("b-1")' d
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	566	$ hg ci -m "mBC-revert-m-0"
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	567	created new head
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	568
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	569	$ hg log -G --rev '::(desc("mCB-revert-m")+desc("mBC-revert-m"))'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	570	@ 33 mBC-revert-m-0
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	571	\|\
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	572	+---o 32 mCB-revert-m-0
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	573	\| \|/
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	574	\| o 6 c-1 delete d
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	575	\| \|
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	576	o \| 5 b-1: b update
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	577	\|/
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	578	o 2 i-2: c -move-> d
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	579	\|
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	580	o 1 i-1: a -move-> c
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	581	\|
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	582	o 0 i-0 initial commit: a b h
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	583
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	584
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	585
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	586	$ hg up null --quiet
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	587
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	588	Test copy information chaining
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	589	==============================
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	590
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	591	merging with unrelated change does not interfere with the renames
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	592	---------------------------------------------------------------
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	593
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	594	- rename on one side
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	595	- unrelated change on the other side
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	596
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	597	$ hg log -G --rev '::(desc("mABm")+desc("mBAm"))'
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	598	o 12 mABm-0 simple merge - the other way
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	599	\|\
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	600	+---o 11 mBAm-0 simple merge - one way
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	601	\| \|/
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	602	\| o 5 b-1: b update
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	603	\| \|
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	604	o \| 4 a-2: e -move-> f
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	605	\| \|
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	606	o \| 3 a-1: d -move-> e
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	607	\|/
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	608	o 2 i-2: c -move-> d
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	609	\|
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	610	o 1 i-1: a -move-> c
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	611	\|
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	612	o 0 i-0 initial commit: a b h
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	613
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	614
44678 806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	615	$ hg status --copies --rev 'desc("b-1")' --rev 'desc("mABm")'
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	616	A f
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	617	d
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	618	R d
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	619	$ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBAm")'
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	620	A f
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	621	d
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	622	R d
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	623	$ hg status --copies --rev 'desc("a-2")' --rev 'desc("mABm")'
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	624	M b
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	625	$ hg status --copies --rev 'desc("a-2")' --rev 'desc("mBAm")'
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	626	M b
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	627	$ hg status --copies --rev 'desc("i-2")' --rev 'desc("mABm")'
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	628	M b
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	629	A f
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	630	d
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	631	R d
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	632	$ hg status --copies --rev 'desc("i-2")' --rev 'desc("mBAm")'
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	633	M b
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	634	A f
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	635	d
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	636	R d
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	637	$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mABm")'
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	638	M b
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	639	A f
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	640	a
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	641	R a
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	642	$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBAm")'
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	643	M b
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	644	A f
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	645	a
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	646	R a
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	647
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	648	merging with the side having a delete
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	649	-------------------------------------
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	650
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	651	case summary:
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	652	- one with change to an unrelated file
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	653	- one deleting the change
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	654	and recreate an unrelated file after the merge
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	655
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	656	$ hg log -G --rev '::(desc("mCBm")+desc("mBCm"))'
45732 4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	657	o 16 mCBm-1 re-add d
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	658	\|
44677 4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	659	o 15 mCBm-0 simple merge - the other way
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	660	\|\
44677 4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	661	\| \| o 14 mBCm-1 re-add d
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	662	\| \| \|
44677 4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	663	+---o 13 mBCm-0 simple merge - one way
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	664	\| \|/
44677 4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	665	\| o 6 c-1 delete d
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	666	\| \|
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	667	o \| 5 b-1: b update
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	668	\|/
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	669	o 2 i-2: c -move-> d
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	670	\|
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	671	o 1 i-1: a -move-> c
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	672	\|
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	673	o 0 i-0 initial commit: a b h
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	674
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	675	- comparing from the merge
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	676
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	677	$ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBCm-0")'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	678	R d
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	679	$ hg status --copies --rev 'desc("b-1")' --rev 'desc("mCBm-0")'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	680	R d
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	681	$ hg status --copies --rev 'desc("c-1")' --rev 'desc("mBCm-0")'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	682	M b
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	683	$ hg status --copies --rev 'desc("c-1")' --rev 'desc("mCBm-0")'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	684	M b
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	685	$ hg status --copies --rev 'desc("i-2")' --rev 'desc("mBCm-0")'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	686	M b
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	687	R d
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	688	$ hg status --copies --rev 'desc("i-2")' --rev 'desc("mCBm-0")'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	689	M b
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	690	R d
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	691	$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBCm-0")'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	692	M b
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	693	R a
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	694	$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCBm-0")'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	695	M b
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	696	R a
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	697
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	698	- comparing with the merge children re-adding the file
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	699
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	700	$ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBCm-1")'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	701	M d
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	702	$ hg status --copies --rev 'desc("b-1")' --rev 'desc("mCBm-1")'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	703	M d
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	704	$ hg status --copies --rev 'desc("c-1")' --rev 'desc("mBCm-1")'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	705	M b
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	706	A d
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	707	$ hg status --copies --rev 'desc("c-1")' --rev 'desc("mCBm-1")'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	708	M b
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	709	A d
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	710	$ hg status --copies --rev 'desc("i-2")' --rev 'desc("mBCm-1")'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	711	M b
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	712	M d
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	713	$ hg status --copies --rev 'desc("i-2")' --rev 'desc("mCBm-1")'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	714	M b
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	715	M d
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	716	$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBCm-1")'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	717	M b
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	718	A d
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	719	R a
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	720	$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCBm-1")'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	721	M b
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	722	A d
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	723	R a
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	724
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	725	Comparing with a merge re-adding the file afterward
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	726	---------------------------------------------------
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	727
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	728	Merge:
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	729	- one with change to an unrelated file
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	730	- one deleting and recreating the change
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	731
44678 806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	732	$ hg log -G --rev '::(desc("mDBm")+desc("mBDm"))'
45732 4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	733	o 18 mDBm-0 simple merge - the other way
44678 806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	734	\|\
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	735	+---o 17 mBDm-0 simple merge - one way
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	736	\| \|/
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	737	\| o 8 d-2 re-add d
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	738	\| \|
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	739	\| o 7 d-1 delete d
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	740	\| \|
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	741	o \| 5 b-1: b update
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	742	\|/
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	743	o 2 i-2: c -move-> d
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	744	\|
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	745	o 1 i-1: a -move-> c
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	746	\|
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	747	o 0 i-0 initial commit: a b h
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	748
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	749	$ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBDm-0")'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	750	M d
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	751	$ hg status --copies --rev 'desc("b-1")' --rev 'desc("mDBm-0")'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	752	M d
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	753	$ hg status --copies --rev 'desc("d-2")' --rev 'desc("mBDm-0")'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	754	M b
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	755	$ hg status --copies --rev 'desc("d-2")' --rev 'desc("mDBm-0")'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	756	M b
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	757	$ hg status --copies --rev 'desc("i-2")' --rev 'desc("mBDm-0")'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	758	M b
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	759	M d
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	760	$ hg status --copies --rev 'desc("i-2")' --rev 'desc("mDBm-0")'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	761	M b
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	762	M d
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	763
44454 b8882f5d7cb4 copies-tests: update the analysis of the BD/DB cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44453 diff changeset	764	The bugs makes recorded copy is different depending of where we started the merge from since
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	765
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	766	$ hg manifest --debug --rev 'desc("mBDm-0")' \| grep '644 d'
44687 1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44678 diff changeset	767	b004912a8510032a0350a74daa2803dadfb00e12 644 d
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	768	$ hg manifest --debug --rev 'desc("mDBm-0")' \| grep '644 d'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	769	b004912a8510032a0350a74daa2803dadfb00e12 644 d
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	770
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	771	$ hg manifest --debug --rev 'desc("d-2")' \| grep '644 d'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	772	b004912a8510032a0350a74daa2803dadfb00e12 644 d
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	773	$ hg manifest --debug --rev 'desc("b-1")' \| grep '644 d'
45704 5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	774	169be882533bc917905d46c0c951aa9a1e288dcf 644 d (no-changeset !)
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	775	b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 d (changeset !)
45732 4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	776	$ hg debugindex d \| head -n 4
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	777	rev linkrev nodeid p1 p2
45704 5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	778	0 2 169be882533b 000000000000 000000000000 (no-changeset !)
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	779	0 2 b789fdd96dc2 000000000000 000000000000 (changeset !)
44677 4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	780	1 8 b004912a8510 000000000000 000000000000
45732 4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	781	2 22 4a067cf8965d 000000000000 000000000000 (no-changeset !)
4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	782	2 22 fe6f8b4f507f 000000000000 000000000000 (changeset !)
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	783
45653 a357688e3c9c tests: update/remove outdated comments in test-copies-chain-merge.t Pulkit Goyal <7895pulkit@gmail.com> parents: 45461 diff changeset	784	Log output should not include a merge commit as it did not happen
44454 b8882f5d7cb4 copies-tests: update the analysis of the BD/DB cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44453 diff changeset	785
45704 5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	786	#if no-changeset
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	787	$ hg log -Gfr 'desc("mBDm-0")' d
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	788	o 8 d-2 re-add d
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	789	\|
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	790	~
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	791	#else
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	792	$ hg log -Gfr 'desc("mBDm-0")' d
44687 1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44678 diff changeset	793	o 8 d-2 re-add d
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	794	\|
44687 1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44678 diff changeset	795	~
45704 5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	796	#endif
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	797
45704 5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	798	#if no-changeset
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	799	$ hg log -Gfr 'desc("mDBm-0")' d
44677 4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	800	o 8 d-2 re-add d
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	801	\|
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	802	~
45704 5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	803	#else
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	804	$ hg log -Gfr 'desc("mDBm-0")' d
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	805	o 8 d-2 re-add d
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	806	\|
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	807	~
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	808	#endif
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	809
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	810	$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBDm-0")'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	811	M b
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	812	A d
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	813	R a
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	814	$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mDBm-0")'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	815	M b
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	816	A d
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	817	R a
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	818
44678 806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	819
44455 275365d85e3f copies-tests: clarify the description of the EA/AE cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44454 diff changeset	820	Comparing with a merge with colliding rename
275365d85e3f copies-tests: clarify the description of the EA/AE cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44454 diff changeset	821	--------------------------------------------
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	822
44455 275365d85e3f copies-tests: clarify the description of the EA/AE cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44454 diff changeset	823	- the "e-" branch renaming b to f (through 'g')
275365d85e3f copies-tests: clarify the description of the EA/AE cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44454 diff changeset	824	- the "a-" branch renaming d to f (through e)
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	825
44678 806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	826	$ hg log -G --rev '::(desc("mAEm")+desc("mEAm"))'
45732 4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	827	o 20 mEAm-0 simple merge - the other way
44678 806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	828	\|\
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	829	+---o 19 mAEm-0 simple merge - one way
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	830	\| \|/
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	831	\| o 10 e-2 g -move-> f
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	832	\| \|
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	833	\| o 9 e-1 b -move-> g
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	834	\| \|
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	835	o \| 4 a-2: e -move-> f
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	836	\| \|
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	837	o \| 3 a-1: d -move-> e
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	838	\|/
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	839	o 2 i-2: c -move-> d
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	840	\|
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	841	o 1 i-1: a -move-> c
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	842	\|
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	843	o 0 i-0 initial commit: a b h
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	844
45704 5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	845	#if no-changeset
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	846	$ hg manifest --debug --rev 'desc("mAEm-0")' \| grep '644 f'
45702 deeb215be337 tests: update test-copies-chain-merge.t to not use empty files Martin von Zweigbergk <martinvonz@google.com> parents: 45670 diff changeset	847	c39c6083dad048d5138618a46f123e2f397f4f18 644 f
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	848	$ hg manifest --debug --rev 'desc("mEAm-0")' \| grep '644 f'
45702 deeb215be337 tests: update test-copies-chain-merge.t to not use empty files Martin von Zweigbergk <martinvonz@google.com> parents: 45670 diff changeset	849	a9a8bc3860c9d8fa5f2f7e6ea8d40498322737fd 644 f
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	850	$ hg manifest --debug --rev 'desc("a-2")' \| grep '644 f'
45702 deeb215be337 tests: update test-copies-chain-merge.t to not use empty files Martin von Zweigbergk <martinvonz@google.com> parents: 45670 diff changeset	851	263ea25e220aaeb7b9bac551c702037849aa75e8 644 f
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	852	$ hg manifest --debug --rev 'desc("e-2")' \| grep '644 f'
45702 deeb215be337 tests: update test-copies-chain-merge.t to not use empty files Martin von Zweigbergk <martinvonz@google.com> parents: 45670 diff changeset	853	71b9b7e73d973572ade6dd765477fcee6890e8b1 644 f
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	854	$ hg debugindex f
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	855	rev linkrev nodeid p1 p2
45702 deeb215be337 tests: update test-copies-chain-merge.t to not use empty files Martin von Zweigbergk <martinvonz@google.com> parents: 45670 diff changeset	856	0 4 263ea25e220a 000000000000 000000000000
deeb215be337 tests: update test-copies-chain-merge.t to not use empty files Martin von Zweigbergk <martinvonz@google.com> parents: 45670 diff changeset	857	1 10 71b9b7e73d97 000000000000 000000000000
deeb215be337 tests: update test-copies-chain-merge.t to not use empty files Martin von Zweigbergk <martinvonz@google.com> parents: 45670 diff changeset	858	2 19 c39c6083dad0 263ea25e220a 71b9b7e73d97
deeb215be337 tests: update test-copies-chain-merge.t to not use empty files Martin von Zweigbergk <martinvonz@google.com> parents: 45670 diff changeset	859	3 20 a9a8bc3860c9 71b9b7e73d97 263ea25e220a
45704 5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	860	#else
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	861	$ hg manifest --debug --rev 'desc("mAEm-0")' \| grep '644 f'
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	862	498e8799f49f9da1ca06bb2d6d4accf165c5b572 644 f
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	863	$ hg manifest --debug --rev 'desc("mEAm-0")' \| grep '644 f'
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	864	c5b506a7118667a38a9c9348a1f63b679e382f57 644 f
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	865	$ hg manifest --debug --rev 'desc("a-2")' \| grep '644 f'
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	866	b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 f
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	867	$ hg manifest --debug --rev 'desc("e-2")' \| grep '644 f'
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	868	1e88685f5ddec574a34c70af492f95b6debc8741 644 f
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	869	$ hg debugindex f
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	870	rev linkrev nodeid p1 p2
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	871	0 4 b789fdd96dc2 000000000000 000000000000
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	872	1 10 1e88685f5dde 000000000000 000000000000
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	873	2 19 498e8799f49f b789fdd96dc2 1e88685f5dde
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	874	3 20 c5b506a71186 1e88685f5dde b789fdd96dc2
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	875	#endif
44758 45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	876
45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	877	# Here the filelog based implementation is not looking at the rename
45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	878	# information (because the file exist on both side). However the changelog
45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	879	# based on works fine. We have different output.
45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	880
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	881	$ hg status --copies --rev 'desc("a-2")' --rev 'desc("mAEm-0")'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	882	M f
44758 45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	883	b (no-filelog !)
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	884	R b
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	885	$ hg status --copies --rev 'desc("a-2")' --rev 'desc("mEAm-0")'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	886	M f
44758 45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	887	b (no-filelog !)
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	888	R b
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	889	$ hg status --copies --rev 'desc("e-2")' --rev 'desc("mAEm-0")'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	890	M f
44758 45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	891	d (no-filelog !)
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	892	R d
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	893	$ hg status --copies --rev 'desc("e-2")' --rev 'desc("mEAm-0")'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	894	M f
44758 45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	895	d (no-filelog !)
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	896	R d
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	897	$ hg status --copies --rev 'desc("i-2")' --rev 'desc("a-2")'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	898	A f
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	899	d
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	900	R d
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	901	$ hg status --copies --rev 'desc("i-2")' --rev 'desc("e-2")'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	902	A f
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	903	b
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	904	R b
44758 45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	905
45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	906	# From here, we run status against revision where both source file exists.
45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	907	#
45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	908	# The filelog based implementation picks an arbitrary side based on revision
45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	909	# numbers. So the same side "wins" whatever the parents order is. This is
45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	910	# sub-optimal because depending on revision numbers means the result can be
45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	911	# different from one repository to the next.
45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	912	#
45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	913	# The changeset based algorithm use the parent order to break tie on conflicting
45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	914	# information and will have a different order depending on who is p1 and p2.
45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	915	# That order is stable accross repositories. (data from p1 prevails)
45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	916
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	917	$ hg status --copies --rev 'desc("i-2")' --rev 'desc("mAEm-0")'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	918	A f
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	919	d
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	920	R b
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	921	R d
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	922	$ hg status --copies --rev 'desc("i-2")' --rev 'desc("mEAm-0")'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	923	A f
44758 45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	924	d (filelog !)
45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	925	b (no-filelog !)
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	926	R b
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	927	R d
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	928	$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mAEm-0")'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	929	A f
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	930	a
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	931	R a
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	932	R b
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	933	$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mEAm-0")'
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	934	A f
44758 45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	935	a (filelog !)
45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	936	b (no-filelog !)
44281 f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	937	R a
f9dfb56ed6e8 copies: add a new test dedicated to testing chain of changeset with merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	938	R b
44458 890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	939
44678 806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	940
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	941	Note:
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	942	\| In this case, one of the merge wrongly record a merge while there is none.
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	943	\| This lead to bad copy tracing information to be dug up.
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	944
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	945
44458 890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	946	Merge:
890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	947	- one with change to an unrelated file (b)
890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	948	- one overwriting a file (d) with a rename (from h to i to d)
890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	949
44678 806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	950	$ hg log -G --rev '::(desc("mBFm")+desc("mFBm"))'
45732 4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	951	o 24 mFBm-0 simple merge - the other way
44678 806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	952	\|\
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	953	+---o 23 mBFm-0 simple merge - one way
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	954	\| \|/
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	955	\| o 22 f-2: rename i -> d
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	956	\| \|
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	957	\| o 21 f-1: rename h -> i
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	958	\| \|
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	959	o \| 5 b-1: b update
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	960	\|/
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	961	o 2 i-2: c -move-> d
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	962	\|
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	963	o 1 i-1: a -move-> c
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	964	\|
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	965	o 0 i-0 initial commit: a b h
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	966
44458 890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	967	$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBFm-0")'
890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	968	M b
890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	969	A d
44687 1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44678 diff changeset	970	h
44458 890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	971	R a
890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	972	R h
890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	973	$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mFBm-0")'
890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	974	M b
890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	975	A d
890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	976	h
890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	977	R a
890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	978	R h
890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	979	$ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBFm-0")'
890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	980	M d
44758 45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	981	h (no-filelog !)
44458 890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	982	R h
890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	983	$ hg status --copies --rev 'desc("f-2")' --rev 'desc("mBFm-0")'
890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	984	M b
890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	985	$ hg status --copies --rev 'desc("f-1")' --rev 'desc("mBFm-0")'
890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	986	M b
890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	987	M d
44758 45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	988	i (no-filelog !)
44458 890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	989	R i
890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	990	$ hg status --copies --rev 'desc("b-1")' --rev 'desc("mFBm-0")'
890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	991	M d
44758 45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	992	h (no-filelog !)
44458 890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	993	R h
890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	994	$ hg status --copies --rev 'desc("f-2")' --rev 'desc("mFBm-0")'
890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	995	M b
890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	996	$ hg status --copies --rev 'desc("f-1")' --rev 'desc("mFBm-0")'
890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	997	M b
890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	998	M d
44758 45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	999	i (no-filelog !)
44458 890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	1000	R i
890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	1001
45704 5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1002	#if no-changeset
44458 890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	1003	$ hg log -Gfr 'desc("mBFm-0")' d
44687 1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44678 diff changeset	1004	o 22 f-2: rename i -> d
44458 890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	1005	\|
44687 1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44678 diff changeset	1006	o 21 f-1: rename h -> i
1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44678 diff changeset	1007	:
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	1008	o 0 i-0 initial commit: a b h
44458 890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	1009
45704 5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1010	#else
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1011	$ hg log -Gfr 'desc("mBFm-0")' d
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1012	o 22 f-2: rename i -> d
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1013	\|
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1014	~
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1015	#endif
44458 890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	1016
45704 5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1017	#if no-changeset
44458 890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	1018	$ hg log -Gfr 'desc("mFBm-0")' d
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	1019	o 22 f-2: rename i -> d
44458 890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	1020	\|
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	1021	o 21 f-1: rename h -> i
44458 890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	1022	:
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	1023	o 0 i-0 initial commit: a b h
44458 890def17d03b copies-tests: add a test with a rename overwriting another file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44457 diff changeset	1024
45704 5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1025	#else
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1026	$ hg log -Gfr 'desc("mFBm-0")' d
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1027	o 22 f-2: rename i -> d
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1028	\|
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1029	~
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1030	#endif
44459 6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1031
44678 806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	1032
44459 6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1033	Merge:
6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1034	- one with change to a file
6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1035	- one deleting and recreating the file
6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1036
44678 806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	1037	Unlike in the 'BD/DB' cases, an actual merge happened here. So we should
44459 6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1038	consider history and rename on both branch of the merge.
6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1039
44678 806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	1040	$ hg log -G --rev '::(desc("mDGm")+desc("mGDm"))'
45732 4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	1041	o 27 mGDm-0 simple merge - the other way
44678 806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	1042	\|\
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	1043	+---o 26 mDGm-0 simple merge - one way
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	1044	\| \|/
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	1045	\| o 25 g-1: update d
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	1046	\| \|
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	1047	o \| 8 d-2 re-add d
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	1048	\| \|
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	1049	o \| 7 d-1 delete d
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	1050	\|/
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	1051	o 2 i-2: c -move-> d
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	1052	\|
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	1053	o 1 i-1: a -move-> c
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	1054	\|
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	1055	o 0 i-0 initial commit: a b h
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	1056
44758 45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	1057	One side of the merge have a long history with rename. The other side of the
45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	1058	merge point to a new file with a smaller history. Each side is "valid".
45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	1059
45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	1060	(and again the filelog based algorithm only explore one, with a pick based on
45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	1061	revision numbers)
45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	1062
44459 6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1063	$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mDGm-0")'
6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1064	A d
44758 45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	1065	a (filelog !)
44459 6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1066	R a
6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1067	$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mGDm-0")'
6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1068	A d
6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1069	a
6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1070	R a
6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1071	$ hg status --copies --rev 'desc("d-2")' --rev 'desc("mDGm-0")'
6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1072	M d
6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1073	$ hg status --copies --rev 'desc("d-2")' --rev 'desc("mGDm-0")'
6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1074	M d
6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1075	$ hg status --copies --rev 'desc("g-1")' --rev 'desc("mDGm-0")'
6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1076	M d
6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1077	$ hg status --copies --rev 'desc("g-1")' --rev 'desc("mGDm-0")'
6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1078	M d
6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1079
45704 5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1080	#if no-changeset
44459 6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1081	$ hg log -Gfr 'desc("mDGm-0")' d
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	1082	o 26 mDGm-0 simple merge - one way
44459 6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1083	\|\
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	1084	\| o 25 g-1: update d
44459 6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1085	\| \|
44677 4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	1086	o \| 8 d-2 re-add d
44459 6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1087	\|/
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	1088	o 2 i-2: c -move-> d
44459 6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1089	\|
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	1090	o 1 i-1: a -move-> c
44459 6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1091	\|
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	1092	o 0 i-0 initial commit: a b h
44459 6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1093
45704 5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1094	#else
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1095	$ hg log -Gfr 'desc("mDGm-0")' d
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1096	o 26 mDGm-0 simple merge - one way
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1097	\|\
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1098	\| o 25 g-1: update d
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1099	\| \|
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1100	o \| 8 d-2 re-add d
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1101	\|/
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1102	o 2 i-2: c -move-> d
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1103	\|
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1104	~
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1105	#endif
44459 6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1106
6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1107
45704 5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1108	#if no-changeset
44459 6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1109	$ hg log -Gfr 'desc("mDGm-0")' d
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	1110	o 26 mDGm-0 simple merge - one way
44459 6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1111	\|\
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	1112	\| o 25 g-1: update d
44459 6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1113	\| \|
44677 4e2845d9452d tests: collect all branch creation in one place in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44662 diff changeset	1114	o \| 8 d-2 re-add d
44459 6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1115	\|/
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	1116	o 2 i-2: c -move-> d
44459 6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1117	\|
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	1118	o 1 i-1: a -move-> c
44459 6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1119	\|
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	1120	o 0 i-0 initial commit: a b h
44459 6f1f4a6f4168 copies-tests: add a case where a file is deleted/added but with a merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44458 diff changeset	1121
45704 5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1122	#else
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1123	$ hg log -Gfr 'desc("mDGm-0")' d
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1124	o 26 mDGm-0 simple merge - one way
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1125	\|\
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1126	\| o 25 g-1: update d
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1127	\| \|
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1128	o \| 8 d-2 re-add d
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1129	\|/
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1130	o 2 i-2: c -move-> d
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1131	\|
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1132	~
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1133	#endif
44460 c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1134
c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1135
c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1136	Merge:
c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1137	- one with change to a file (d)
c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1138	- one overwriting that file with a rename (from h to i, to d)
c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1139
c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1140	This case is similar to BF/FB, but an actual merge happens, so both side of the
c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1141	history are relevant.
c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1142
c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1143	Note:
c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1144	\| In this case, the merge get conflicting information since on one side we have
c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1145	\| "a -> c -> d". and one the other one we have "h -> i -> d".
c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1146	\|
c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1147	\| The current code arbitrarily pick one side
c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1148
44678 806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	1149	$ hg log -G --rev '::(desc("mGFm")+desc("mFGm"))'
45732 4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	1150	o 29 mGFm-0 simple merge - the other way
44678 806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	1151	\|\
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	1152	+---o 28 mFGm-0 simple merge - one way
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	1153	\| \|/
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	1154	\| o 25 g-1: update d
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	1155	\| \|
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	1156	o \| 22 f-2: rename i -> d
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	1157	\| \|
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	1158	o \| 21 f-1: rename h -> i
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	1159	\|/
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	1160	o 2 i-2: c -move-> d
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	1161	\|
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	1162	o 1 i-1: a -move-> c
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	1163	\|
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	1164	o 0 i-0 initial commit: a b h
806f1f1ba430 tests: move verification closer to setup in test-copies-chain-merge.t Martin von Zweigbergk <martinvonz@google.com> parents: 44677 diff changeset	1165
44460 c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1166	$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mFGm-0")'
c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1167	A d
45702 deeb215be337 tests: update test-copies-chain-merge.t to not use empty files Martin von Zweigbergk <martinvonz@google.com> parents: 45670 diff changeset	1168	h
44460 c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1169	R a
c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1170	R h
c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1171	$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mGFm-0")'
c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1172	A d
45702 deeb215be337 tests: update test-copies-chain-merge.t to not use empty files Martin von Zweigbergk <martinvonz@google.com> parents: 45670 diff changeset	1173	a (no-filelog !)
deeb215be337 tests: update test-copies-chain-merge.t to not use empty files Martin von Zweigbergk <martinvonz@google.com> parents: 45670 diff changeset	1174	h (filelog !)
44460 c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1175	R a
c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1176	R h
c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1177	$ hg status --copies --rev 'desc("f-2")' --rev 'desc("mFGm-0")'
c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1178	M d
c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1179	$ hg status --copies --rev 'desc("f-2")' --rev 'desc("mGFm-0")'
c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1180	M d
c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1181	$ hg status --copies --rev 'desc("f-1")' --rev 'desc("mFGm-0")'
c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1182	M d
44758 45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	1183	i (no-filelog !)
44460 c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1184	R i
c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1185	$ hg status --copies --rev 'desc("f-1")' --rev 'desc("mGFm-0")'
c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1186	M d
44758 45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	1187	i (no-filelog !)
44460 c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1188	R i
c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1189	$ hg status --copies --rev 'desc("g-1")' --rev 'desc("mFGm-0")'
c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1190	M d
44758 45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	1191	h (no-filelog !)
44460 c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1192	R h
c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1193	$ hg status --copies --rev 'desc("g-1")' --rev 'desc("mGFm-0")'
c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1194	M d
44758 45f3f35cefe7 copies: fix the changeset based algorithm regarding merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44687 diff changeset	1195	h (no-filelog !)
44460 c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1196	R h
c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1197
45704 5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1198	#if no-changeset
44460 c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1199	$ hg log -Gfr 'desc("mFGm-0")' d
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	1200	o 28 mFGm-0 simple merge - one way
44460 c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1201	\|\
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	1202	\| o 25 g-1: update d
44460 c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1203	\| \|
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	1204	o \| 22 f-2: rename i -> d
44460 c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1205	\| \|
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	1206	o \| 21 f-1: rename h -> i
44460 c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1207	\|/
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	1208	o 2 i-2: c -move-> d
44460 c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1209	\|
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	1210	o 1 i-1: a -move-> c
44460 c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1211	\|
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	1212	o 0 i-0 initial commit: a b h
44460 c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1213
45704 5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1214	#else
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1215	$ hg log -Gfr 'desc("mFGm-0")' d
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1216	o 28 mFGm-0 simple merge - one way
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1217	\|\
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1218	\| o 25 g-1: update d
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1219	\| \|
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1220	o \| 22 f-2: rename i -> d
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1221	\|/
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1222	o 2 i-2: c -move-> d
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1223	\|
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1224	~
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1225	#endif
44460 c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1226
45704 5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1227	#if no-changeset
44460 c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1228	$ hg log -Gfr 'desc("mGFm-0")' d
45732 4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	1229	o 29 mGFm-0 simple merge - the other way
44460 c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1230	\|\
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	1231	\| o 25 g-1: update d
44460 c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1232	\| \|
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	1233	o \| 22 f-2: rename i -> d
44460 c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1234	\| \|
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	1235	o \| 21 f-1: rename h -> i
44460 c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1236	\|/
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	1237	o 2 i-2: c -move-> d
44460 c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1238	\|
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	1239	o 1 i-1: a -move-> c
44460 c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1240	\|
44662 25d97090c6ca copies-tests: remove spurious `]` in the template Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44460 diff changeset	1241	o 0 i-0 initial commit: a b h
44460 c8fd21413458 copies-tests: add a case where with merge with an overwritten files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44459 diff changeset	1242
45704 5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1243	#else
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1244	$ hg log -Gfr 'desc("mGFm-0")' d
45732 4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	1245	o 29 mGFm-0 simple merge - the other way
45704 5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1246	\|\
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1247	\| o 25 g-1: update d
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1248	\| \|
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1249	o \| 22 f-2: rename i -> d
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1250	\|/
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1251	o 2 i-2: c -move-> d
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1252	\|
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1253	~
5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1254	#endif
45460 4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1255
4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1256
4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1257	Comparing with merging with a deletion (and keeping the file)
4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1258	-------------------------------------------------------------
4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1259
4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1260	Merge:
4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1261	- one removing a file (d)
4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1262	- one updating that file
4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1263	- the merge keep the modified version of the file (canceling the delete)
4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1264
4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1265	In this case, the file keep on living after the merge. So we should not drop its
4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1266	copy tracing chain.
4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1267
4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1268	$ hg log -G --rev '::(desc("mCGm")+desc("mGCm"))'
45732 4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	1269	o 31 mGCm-0
45460 4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1270	\|\
4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1271	+---o 30 mCGm-0
4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1272	\| \|/
4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1273	\| o 25 g-1: update d
4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1274	\| \|
4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1275	o \| 6 c-1 delete d
4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1276	\|/
4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1277	o 2 i-2: c -move-> d
4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1278	\|
4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1279	o 1 i-1: a -move-> c
4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1280	\|
4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1281	o 0 i-0 initial commit: a b h
4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1282
4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1283
45670 a8fb29b05f92 salvaged: properly deal with salvaged file during copy tracing Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45669 diff changeset	1284	'a' is the copy source of 'd'
45460 4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1285
4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1286	$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCGm-0")'
4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1287	A d
45704 5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1288	a (no-compatibility no-changeset !)
45460 4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1289	R a
4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1290	$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mGCm-0")'
4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1291	A d
45704 5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1292	a (no-compatibility no-changeset !)
45460 4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1293	R a
4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1294	$ hg status --copies --rev 'desc("c-1")' --rev 'desc("mCGm-0")'
4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1295	A d
4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1296	$ hg status --copies --rev 'desc("c-1")' --rev 'desc("mGCm-0")'
4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1297	A d
4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1298	$ hg status --copies --rev 'desc("g-1")' --rev 'desc("mCGm-0")'
4b582a93316a copy-tracing: test case where we go across a changed/deleted merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44758 diff changeset	1299	$ hg status --copies --rev 'desc("g-1")' --rev 'desc("mGCm-0")'
45461 14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1300
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1301
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1302	Comparing with merge restoring an untouched deleted file
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1303	--------------------------------------------------------
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1304
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1305	Merge:
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1306	- one removing a file (d)
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1307	- one leaving the file untouched
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1308	- the merge actively restore the file to the same content.
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1309
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1310	In this case, the file keep on living after the merge. So we should not drop its
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1311	copy tracing chain.
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1312
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1313	$ hg log -G --rev '::(desc("mCB-revert-m")+desc("mBC-revert-m"))'
45732 4ffe502673c3 copies: split creation of the graph and actual checking again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45704 diff changeset	1314	o 33 mBC-revert-m-0
45461 14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1315	\|\
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1316	+---o 32 mCB-revert-m-0
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1317	\| \|/
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1318	\| o 6 c-1 delete d
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1319	\| \|
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1320	o \| 5 b-1: b update
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1321	\|/
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1322	o 2 i-2: c -move-> d
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1323	\|
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1324	o 1 i-1: a -move-> c
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1325	\|
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1326	o 0 i-0 initial commit: a b h
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1327
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1328
45670 a8fb29b05f92 salvaged: properly deal with salvaged file during copy tracing Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45669 diff changeset	1329	'a' is the the copy source of 'd'
45461 14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1330
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1331	$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCB-revert-m-0")'
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1332	M b
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1333	A d
45704 5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1334	a (no-compatibility no-changeset !)
45461 14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1335	R a
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1336	$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBC-revert-m-0")'
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1337	M b
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1338	A d
45704 5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1339	a (no-compatibility no-changeset !)
45461 14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1340	R a
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1341	$ hg status --copies --rev 'desc("c-1")' --rev 'desc("mCB-revert-m-0")'
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1342	M b
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1343	A d
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1344	$ hg status --copies --rev 'desc("c-1")' --rev 'desc("mBC-revert-m-0")'
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1345	M b
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1346	A d
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1347	$ hg status --copies --rev 'desc("b-1")' --rev 'desc("mCB-revert-m-0")'
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1348	$ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBC-revert-m-0")'
14be07d5603c copy-tracing: test case where a merge reverted a file deletion Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45460 diff changeset	1349
45664 8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1350
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1351	Test that sidedata computations during upgrades ares correct
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1352	============================================================
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1353
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1354	We upgrade a repository that is not using sidedata (the filelog case) and
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1355	check that the same side data have been generated as if they were computed at
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1356	commit time.
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1357
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1358
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1359	#if filelog
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1360	$ cat >> $HGRCPATH << EOF
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1361	> [format]
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1362	> exp-use-side-data = yes
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1363	> exp-use-copies-side-data-changeset = yes
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1364	> EOF
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1365	$ hg debugformat -v
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1366	format-variant repo config default
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1367	fncache: yes yes yes
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1368	dotencode: yes yes yes
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1369	generaldelta: yes yes yes
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1370	sparserevlog: yes yes yes
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1371	sidedata: no yes no
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1372	persistent-nodemap: no no no
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1373	copies-sdc: no yes no
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1374	plain-cl-delta: yes yes yes
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1375	compression: * (glob)
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1376	compression-level: default default default
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1377	$ hg debugupgraderepo --run --quiet
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1378	upgrade will perform the following actions:
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1379
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1380	requirements
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1381	preserved: * (glob)
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1382	added: exp-copies-sidedata-changeset, exp-sidedata-flag
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1383
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1384	#endif
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1385
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1386
45704 5e72827dae1e tests: run test-copies-chain-merge.t also with copies in changesets Martin von Zweigbergk <martinvonz@google.com> parents: 45702 diff changeset	1387	#if no-compatibility no-changeset
45664 8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1388
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1389	$ for rev in `hg log --rev 'all()' -T '{rev}\n'`; do
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1390	> echo "##### revision $rev #####"
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1391	> hg debugsidedata -c -v -- $rev
45665 308ca5528ee6 changing-files: add a debug command display changed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45664 diff changeset	1392	> hg debugchangedfiles $rev
45664 8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1393	> done
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1394	##### revision 0 #####
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1395	1 sidedata entries
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1396	entry-0014 size 34
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1397	'\x00\x00\x00\x03\x04\x00\x00\x00\x01\x00\x00\x00\x00\x04\x00\x00\x00\x02\x00\x00\x00\x00\x04\x00\x00\x00\x03\x00\x00\x00\x00abh'
45665 308ca5528ee6 changing-files: add a debug command display changed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45664 diff changeset	1398	added : a, ;
308ca5528ee6 changing-files: add a debug command display changed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45664 diff changeset	1399	added : b, ;
308ca5528ee6 changing-files: add a debug command display changed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45664 diff changeset	1400	added : h, ;
45664 8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1401	##### revision 1 #####
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1402	1 sidedata entries
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1403	entry-0014 size 24
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1404	'\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00ac'
45665 308ca5528ee6 changing-files: add a debug command display changed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45664 diff changeset	1405	removed : a, ;
308ca5528ee6 changing-files: add a debug command display changed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45664 diff changeset	1406	added p1: c, a;
45664 8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1407	##### revision 2 #####
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1408	1 sidedata entries
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1409	entry-0014 size 24
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1410	'\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00cd'
45665 308ca5528ee6 changing-files: add a debug command display changed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45664 diff changeset	1411	removed : c, ;
308ca5528ee6 changing-files: add a debug command display changed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45664 diff changeset	1412	added p1: d, c;
45664 8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1413	##### revision 3 #####
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1414	1 sidedata entries
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1415	entry-0014 size 24
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1416	'\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00de'
45665 308ca5528ee6 changing-files: add a debug command display changed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45664 diff changeset	1417	removed : d, ;
308ca5528ee6 changing-files: add a debug command display changed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45664 diff changeset	1418	added p1: e, d;
45664 8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1419	##### revision 4 #####
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1420	1 sidedata entries
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1421	entry-0014 size 24
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1422	'\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00ef'
45665 308ca5528ee6 changing-files: add a debug command display changed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45664 diff changeset	1423	removed : e, ;
308ca5528ee6 changing-files: add a debug command display changed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45664 diff changeset	1424	added p1: f, e;
45664 8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1425	##### revision 5 #####
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1426	1 sidedata entries
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1427	entry-0014 size 14
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1428	'\x00\x00\x00\x01\x14\x00\x00\x00\x01\x00\x00\x00\x00b'
45665 308ca5528ee6 changing-files: add a debug command display changed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45664 diff changeset	1429	touched : b, ;
45664 8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1430	##### revision 6 #####
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1431	1 sidedata entries
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1432	entry-0014 size 14
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1433	'\x00\x00\x00\x01\x0c\x00\x00\x00\x01\x00\x00\x00\x00d'
45665 308ca5528ee6 changing-files: add a debug command display changed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45664 diff changeset	1434	removed : d, ;
45664 8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1435	##### revision 7 #####
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1436	1 sidedata entries
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1437	entry-0014 size 14
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1438	'\x00\x00\x00\x01\x0c\x00\x00\x00\x01\x00\x00\x00\x00d'
45665 308ca5528ee6 changing-files: add a debug command display changed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45664 diff changeset	1439	removed : d, ;
45664 8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1440	##### revision 8 #####
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1441	1 sidedata entries
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1442	entry-0014 size 14
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1443	'\x00\x00\x00\x01\x04\x00\x00\x00\x01\x00\x00\x00\x00d'
45665 308ca5528ee6 changing-files: add a debug command display changed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45664 diff changeset	1444	added : d, ;
45664 8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1445	##### revision 9 #####
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1446	1 sidedata entries
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1447	entry-0014 size 24
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1448	'\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00bg'
45665 308ca5528ee6 changing-files: add a debug command display changed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45664 diff changeset	1449	removed : b, ;
308ca5528ee6 changing-files: add a debug command display changed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45664 diff changeset	1450	added p1: g, b;
45664 8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1451	##### revision 10 #####
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1452	1 sidedata entries
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1453	entry-0014 size 24
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1454	'\x00\x00\x00\x02\x06\x00\x00\x00\x01\x00\x00\x00\x01\x0c\x00\x00\x00\x02\x00\x00\x00\x00fg'
45665 308ca5528ee6 changing-files: add a debug command display changed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45664 diff changeset	1455	added p1: f, g;
308ca5528ee6 changing-files: add a debug command display changed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45664 diff changeset	1456	removed : g, ;
45664 8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1457	##### revision 11 #####
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1458	1 sidedata entries
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1459	entry-0014 size 4
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1460	'\x00\x00\x00\x00'
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1461	##### revision 12 #####
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1462	1 sidedata entries
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1463	entry-0014 size 4
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1464	'\x00\x00\x00\x00'
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1465	##### revision 13 #####
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1466	1 sidedata entries
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1467	entry-0014 size 4
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1468	'\x00\x00\x00\x00'
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1469	##### revision 14 #####
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1470	1 sidedata entries
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1471	entry-0014 size 14
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1472	'\x00\x00\x00\x01\x04\x00\x00\x00\x01\x00\x00\x00\x00d'
45665 308ca5528ee6 changing-files: add a debug command display changed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45664 diff changeset	1473	added : d, ;
45664 8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1474	##### revision 15 #####
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1475	1 sidedata entries
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1476	entry-0014 size 4
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1477	'\x00\x00\x00\x00'
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1478	##### revision 16 #####
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1479	1 sidedata entries
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1480	entry-0014 size 14
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1481	'\x00\x00\x00\x01\x04\x00\x00\x00\x01\x00\x00\x00\x00d'
45665 308ca5528ee6 changing-files: add a debug command display changed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45664 diff changeset	1482	added : d, ;
45664 8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1483	##### revision 17 #####
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1484	1 sidedata entries
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1485	entry-0014 size 4
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1486	'\x00\x00\x00\x00'
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1487	##### revision 18 #####
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1488	1 sidedata entries
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1489	entry-0014 size 4
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1490	'\x00\x00\x00\x00'
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1491	##### revision 19 #####
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1492	1 sidedata entries
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1493	entry-0014 size 14
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1494	'\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00f'
45665 308ca5528ee6 changing-files: add a debug command display changed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45664 diff changeset	1495	merged : f, ;
45664 8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1496	##### revision 20 #####
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1497	1 sidedata entries
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1498	entry-0014 size 14
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1499	'\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00f'
45665 308ca5528ee6 changing-files: add a debug command display changed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45664 diff changeset	1500	merged : f, ;
45664 8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1501	##### revision 21 #####
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1502	1 sidedata entries
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1503	entry-0014 size 24
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1504	'\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00hi'
45665 308ca5528ee6 changing-files: add a debug command display changed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45664 diff changeset	1505	removed : h, ;
308ca5528ee6 changing-files: add a debug command display changed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45664 diff changeset	1506	added p1: i, h;
45664 8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1507	##### revision 22 #####
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1508	1 sidedata entries
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1509	entry-0014 size 24
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1510	'\x00\x00\x00\x02\x16\x00\x00\x00\x01\x00\x00\x00\x01\x0c\x00\x00\x00\x02\x00\x00\x00\x00di'
45665 308ca5528ee6 changing-files: add a debug command display changed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45664 diff changeset	1511	touched p1: d, i;
308ca5528ee6 changing-files: add a debug command display changed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45664 diff changeset	1512	removed : i, ;
45664 8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1513	##### revision 23 #####
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1514	1 sidedata entries
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1515	entry-0014 size 4
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1516	'\x00\x00\x00\x00'
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1517	##### revision 24 #####
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1518	1 sidedata entries
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1519	entry-0014 size 4
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1520	'\x00\x00\x00\x00'
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1521	##### revision 25 #####
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1522	1 sidedata entries
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1523	entry-0014 size 14
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1524	'\x00\x00\x00\x01\x14\x00\x00\x00\x01\x00\x00\x00\x00d'
45665 308ca5528ee6 changing-files: add a debug command display changed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45664 diff changeset	1525	touched : d, ;
45664 8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1526	##### revision 26 #####
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1527	1 sidedata entries
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1528	entry-0014 size 14
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1529	'\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d'
45665 308ca5528ee6 changing-files: add a debug command display changed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45664 diff changeset	1530	merged : d, ;
45664 8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1531	##### revision 27 #####
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1532	1 sidedata entries
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1533	entry-0014 size 14
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1534	'\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d'
45665 308ca5528ee6 changing-files: add a debug command display changed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45664 diff changeset	1535	merged : d, ;
45664 8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1536	##### revision 28 #####
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1537	1 sidedata entries
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1538	entry-0014 size 14
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1539	'\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d'
45665 308ca5528ee6 changing-files: add a debug command display changed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45664 diff changeset	1540	merged : d, ;
45664 8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1541	##### revision 29 #####
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1542	1 sidedata entries
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1543	entry-0014 size 14
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1544	'\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d'
45665 308ca5528ee6 changing-files: add a debug command display changed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45664 diff changeset	1545	merged : d, ;
45664 8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1546	##### revision 30 #####
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1547	1 sidedata entries
45669 e53778ad64bf salvaged: persist the salvaged set on disk Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45665 diff changeset	1548	entry-0014 size 14
e53778ad64bf salvaged: persist the salvaged set on disk Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45665 diff changeset	1549	'\x00\x00\x00\x01\x10\x00\x00\x00\x01\x00\x00\x00\x00d'
e53778ad64bf salvaged: persist the salvaged set on disk Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45665 diff changeset	1550	salvaged : d, ;
45664 8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1551	##### revision 31 #####
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1552	1 sidedata entries
45669 e53778ad64bf salvaged: persist the salvaged set on disk Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45665 diff changeset	1553	entry-0014 size 14
e53778ad64bf salvaged: persist the salvaged set on disk Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45665 diff changeset	1554	'\x00\x00\x00\x01\x10\x00\x00\x00\x01\x00\x00\x00\x00d'
e53778ad64bf salvaged: persist the salvaged set on disk Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45665 diff changeset	1555	salvaged : d, ;
45664 8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1556	##### revision 32 #####
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1557	1 sidedata entries
45669 e53778ad64bf salvaged: persist the salvaged set on disk Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45665 diff changeset	1558	entry-0014 size 14
e53778ad64bf salvaged: persist the salvaged set on disk Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45665 diff changeset	1559	'\x00\x00\x00\x01\x10\x00\x00\x00\x01\x00\x00\x00\x00d'
e53778ad64bf salvaged: persist the salvaged set on disk Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45665 diff changeset	1560	salvaged : d, ;
45664 8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1561	##### revision 33 #####
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1562	1 sidedata entries
45669 e53778ad64bf salvaged: persist the salvaged set on disk Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45665 diff changeset	1563	entry-0014 size 14
e53778ad64bf salvaged: persist the salvaged set on disk Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45665 diff changeset	1564	'\x00\x00\x00\x01\x10\x00\x00\x00\x01\x00\x00\x00\x00d'
e53778ad64bf salvaged: persist the salvaged set on disk Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45665 diff changeset	1565	salvaged : d, ;
45664 8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1566
8cebc4c13978 side-data: add a test to check sidedata upgrade Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45658 diff changeset	1567	#endif

author	Pierre-Yves David <pierre-yves.david@octobus.net>
	Tue, 13 Oct 2020 02:45:24 +0200
changeset 45732	4ffe502673c3
parent 45704	5e72827dae1e
child 45733	ee3fd9021fac
permissions	-rw-r--r--