Mercurial > hg
annotate tests/test-copies-chain-merge.t @ 46551:cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
The revision number are not very informative and can change when new changeset
are added, creating unnecessary churn. We change the template before adding more
test to improve clarify of the over changesets.
Differential Revision: https://phab.mercurial-scm.org/D10049
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 19 Feb 2021 22:27:25 +0100 |
parents | 74e2256a56b8 |
children | 9cd4f58467af |
rev | line source |
---|---|
45735
edf4fa06df94
upgrade: allow sidedata upgrade to modify revision flag
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45733
diff
changeset
|
1 #testcases filelog compatibility changeset sidedata upgraded |
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 |
45765
ed84a4d48910
config: add a new [command-templates] section for templates defined by hg
Martin von Zweigbergk <martinvonz@google.com>
parents:
45735
diff
changeset
|
20 > [command-templates] |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
21 > log={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 |
46531
d46885119f90
test-copies: don't use empty file for "same content" cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46527
diff
changeset
|
48 $ cat > same-content.txt << EOF |
d46885119f90
test-copies: don't use empty file for "same content" cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46527
diff
changeset
|
49 > Here is some content that will be the same accros multiple file. |
d46885119f90
test-copies: don't use empty file for "same content" cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46527
diff
changeset
|
50 > |
d46885119f90
test-copies: don't use empty file for "same content" cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46527
diff
changeset
|
51 > This is done on purpose so that we end up in some merge situation, were the |
d46885119f90
test-copies: don't use empty file for "same content" cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46527
diff
changeset
|
52 > resulting content is the same as in the parent(s), but a new filenodes still |
d46885119f90
test-copies: don't use empty file for "same content" cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46527
diff
changeset
|
53 > need to be created to record some file history information (especially |
d46885119f90
test-copies: don't use empty file for "same content" cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46527
diff
changeset
|
54 > about copies). |
d46885119f90
test-copies: don't use empty file for "same content" cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46527
diff
changeset
|
55 > EOF |
d46885119f90
test-copies: don't use empty file for "same content" cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46527
diff
changeset
|
56 |
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 $ 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
|
58 $ 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
|
59 |
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 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
|
61 |
46531
d46885119f90
test-copies: don't use empty file for "same content" cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46527
diff
changeset
|
62 $ cp ../same-content.txt a |
d46885119f90
test-copies: don't use empty file for "same content" cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46527
diff
changeset
|
63 $ cp ../same-content.txt b |
d46885119f90
test-copies: don't use empty file for "same content" cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46527
diff
changeset
|
64 $ cp ../same-content.txt 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
|
65 $ 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
|
66 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
|
67 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
|
68 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
|
69 $ 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
|
70 $ 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
|
71 $ 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
|
72 $ 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
|
73 $ hg log -G |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
74 @ 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
|
75 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
76 o 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
|
77 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
78 o 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
|
79 |
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 |
44453
68e14fecd82a
copies-tests: swap two branch description
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44444
diff
changeset
|
81 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
|
82 |
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
|
83 $ 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
|
84 $ 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
|
85 $ 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
|
86 $ 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
|
87 $ hg log -G --rev '::.' |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
88 @ 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
|
89 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
90 o 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
|
91 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
92 o 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
|
93 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
94 o 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
|
95 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
96 o 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
|
97 |
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
|
98 |
44453
68e14fecd82a
copies-tests: swap two branch description
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44444
diff
changeset
|
99 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
|
100 |
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 $ 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
|
102 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
|
103 $ 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
|
104 $ 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
|
105 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
|
106 $ hg log -G --rev '::.' |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
107 @ 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
|
108 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
109 o 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
|
110 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
111 o 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
|
112 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
113 o 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
|
114 |
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
|
115 |
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
|
116 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
|
117 |
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 $ 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
|
119 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
|
120 $ 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
|
121 $ 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
|
122 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
|
123 $ hg log -G --rev '::.' |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
124 @ c-1 delete 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
|
125 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
126 o i-2: c -move-> 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
|
127 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
128 o i-1: a -move-> c |
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
|
129 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
130 o i-0 initial commit: a b h |
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
|
131 |
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 |
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 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
|
134 |
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 $ 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
|
136 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
|
137 $ 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
|
138 $ 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
|
139 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
|
140 $ 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
|
141 $ 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
|
142 $ 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
|
143 $ hg log -G --rev '::.' |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
144 @ d-2 re-add 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
|
145 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
146 o d-1 delete 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
|
147 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
148 o i-2: c -move-> 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
|
149 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
150 o i-1: a -move-> c |
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
|
151 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
152 o i-0 initial commit: a b h |
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
|
153 |
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 |
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 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
|
156 |
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 $ 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
|
158 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
|
159 $ 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
|
160 $ 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
|
161 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
|
162 $ 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
|
163 $ 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
|
164 $ hg log -G --rev '::.' |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
165 @ e-2 g -move-> f |
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
|
166 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
167 o e-1 b -move-> g |
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
|
168 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
169 o i-2: c -move-> 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
|
170 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
171 o i-1: a -move-> c |
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
|
172 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
173 o i-0 initial commit: a b h |
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
|
174 |
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
|
175 |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
176 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
|
177 =============== |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
178 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
179 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
|
180 information. |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
181 |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
182 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
|
183 --------------------------------------------------------------- |
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
184 |
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
185 - 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
|
186 - 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
|
187 |
46533
e20977208924
test-copies: improve description of the A+B case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46532
diff
changeset
|
188 $ case_desc="simple merge - A side: multiple renames, B side: unrelated update" |
46532
c9f502721783
test-copies: use intermediate variable some commit descriptions
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46531
diff
changeset
|
189 |
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
|
190 $ 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
|
191 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
|
192 $ 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
|
193 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
|
194 (branch merge, don't forget to commit) |
46532
c9f502721783
test-copies: use intermediate variable some commit descriptions
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46531
diff
changeset
|
195 $ hg ci -m "mBAm-0 $case_desc - 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 $ 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
|
197 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
|
198 $ 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
|
199 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
|
200 (branch merge, don't forget to commit) |
46532
c9f502721783
test-copies: use intermediate variable some commit descriptions
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46531
diff
changeset
|
201 $ hg ci -m "mABm-0 $case_desc - 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
|
202 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
|
203 $ hg log -G --rev '::(desc("mABm")+desc("mBAm"))' |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
204 @ mABm-0 simple merge - A side: multiple renames, B side: unrelated update - 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
|
205 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
206 +---o mBAm-0 simple merge - A side: multiple renames, B side: unrelated update - 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
|
207 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
208 | o 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
|
209 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
210 o | 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
|
211 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
212 o | 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
|
213 |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
214 o 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
|
215 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
216 o 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
|
217 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
218 o 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
|
219 |
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
|
220 |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
221 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
222 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
|
223 ------------------------------------- |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
224 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
225 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
|
226 - 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
|
227 - 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
|
228 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
|
229 |
46534
979838adc46b
test-copies: improve description of the B+C case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46533
diff
changeset
|
230 $ case_desc="simple merge - C side: delete a file with copies history , B side: unrelated update" |
46532
c9f502721783
test-copies: use intermediate variable some commit descriptions
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46531
diff
changeset
|
231 |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
232 $ 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
|
233 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
|
234 $ 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
|
235 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
|
236 (branch merge, don't forget to commit) |
46532
c9f502721783
test-copies: use intermediate variable some commit descriptions
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46531
diff
changeset
|
237 $ hg ci -m "mBCm-0 $case_desc - one way" |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
238 $ 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
|
239 $ 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
|
240 $ 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
|
241 $ 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
|
242 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
|
243 $ 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
|
244 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
|
245 (branch merge, don't forget to commit) |
46532
c9f502721783
test-copies: use intermediate variable some commit descriptions
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46531
diff
changeset
|
246 $ hg ci -m "mCBm-0 $case_desc - the other way" |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
247 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
|
248 $ 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
|
249 $ 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
|
250 $ 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
|
251 $ hg log -G --rev '::(desc("mCBm")+desc("mBCm"))' |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
252 @ mCBm-1 re-add 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
|
253 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
254 o mCBm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - the other way |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
255 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
256 | | o mBCm-1 re-add 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
|
257 | | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
258 +---o mBCm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - one way |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
259 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
260 | o c-1 delete 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
|
261 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
262 o | b-1: b update |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
263 |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
264 o i-2: c -move-> 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
|
265 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
266 o i-1: a -move-> c |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
267 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
268 o i-0 initial commit: a b h |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
269 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
270 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
271 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
|
272 --------------------------------------------------- |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
273 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
274 Merge: |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
275 - 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
|
276 - 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
|
277 |
46535
9a58f9eed303
test-copies: improve description of the B+D case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46534
diff
changeset
|
278 $ case_desc="simple merge - B side: unrelated update, D side: delete and recreate a file (with different content)" |
46532
c9f502721783
test-copies: use intermediate variable some commit descriptions
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46531
diff
changeset
|
279 |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
280 $ 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
|
281 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
|
282 $ 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
|
283 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
|
284 (branch merge, don't forget to commit) |
46532
c9f502721783
test-copies: use intermediate variable some commit descriptions
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46531
diff
changeset
|
285 $ hg ci -m "mBDm-0 $case_desc - one way" |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
286 $ 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
|
287 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
|
288 $ 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
|
289 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
|
290 (branch merge, don't forget to commit) |
46532
c9f502721783
test-copies: use intermediate variable some commit descriptions
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46531
diff
changeset
|
291 $ hg ci -m "mDBm-0 $case_desc - the other way" |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
292 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
|
293 $ hg log -G --rev '::(desc("mDBm")+desc("mBDm"))' |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
294 @ mDBm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - the other way |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
295 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
296 +---o mBDm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - one way |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
297 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
298 | o d-2 re-add 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
|
299 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
300 | o d-1 delete 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
|
301 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
302 o | b-1: b update |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
303 |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
304 o i-2: c -move-> 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
|
305 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
306 o i-1: a -move-> c |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
307 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
308 o i-0 initial commit: a b h |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
309 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
310 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
311 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
312 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
|
313 -------------------------------------------- |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
314 |
46543
f01696d45d1e
test-copies: add subcase titles for various "conflicting" information variant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46542
diff
changeset
|
315 Subcase: new copy information on both side |
f01696d45d1e
test-copies: add subcase titles for various "conflicting" information variant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46542
diff
changeset
|
316 `````````````````````````````````````````` |
f01696d45d1e
test-copies: add subcase titles for various "conflicting" information variant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46542
diff
changeset
|
317 |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
318 - 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
|
319 - 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
|
320 |
46536
19f490690880
test-copies: improve description of the A+E case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46535
diff
changeset
|
321 $ case_desc="merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f)" |
46532
c9f502721783
test-copies: use intermediate variable some commit descriptions
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46531
diff
changeset
|
322 |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
323 $ 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
|
324 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
46527
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
325 $ hg merge 'desc("e-2")' |
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
326 1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !) |
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
327 0 files updated, 0 files merged, 1 files removed, 0 files unresolved (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
|
328 (branch merge, don't forget to commit) |
46532
c9f502721783
test-copies: use intermediate variable some commit descriptions
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46531
diff
changeset
|
329 $ hg ci -m "mAEm-0 $case_desc - one way" |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
330 $ hg up 'desc("e-2")' |
46527
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
331 2 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !) |
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
332 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !) |
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
333 $ hg merge 'desc("a-2")' |
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
334 1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !) |
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
335 0 files updated, 0 files merged, 1 files removed, 0 files unresolved (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
|
336 (branch merge, don't forget to commit) |
46532
c9f502721783
test-copies: use intermediate variable some commit descriptions
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46531
diff
changeset
|
337 $ hg ci -m "mEAm-0 $case_desc - the other way" |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
338 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
|
339 $ hg log -G --rev '::(desc("mAEm")+desc("mEAm"))' |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
340 @ mEAm-0 merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f) - the other way |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
341 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
342 +---o mAEm-0 merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f) - one way |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
343 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
344 | o e-2 g -move-> f |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
345 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
346 | o e-1 b -move-> g |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
347 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
348 o | a-2: e -move-> f |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
349 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
350 o | a-1: d -move-> e |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
351 |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
352 o i-2: c -move-> 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
|
353 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
354 o i-1: a -move-> c |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
355 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
356 o i-0 initial commit: a b h |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
357 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
358 |
46543
f01696d45d1e
test-copies: add subcase titles for various "conflicting" information variant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46542
diff
changeset
|
359 Subcase: existing copy information overwritten on one branch |
f01696d45d1e
test-copies: add subcase titles for various "conflicting" information variant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46542
diff
changeset
|
360 ```````````````````````````````````````````````````````````` |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
361 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
362 Merge: |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
363 - 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
|
364 - 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
|
365 |
46542
f8888f5c8c50
test-copies: improve description of the B+F case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46541
diff
changeset
|
366 $ case_desc="simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d)" |
46532
c9f502721783
test-copies: use intermediate variable some commit descriptions
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46531
diff
changeset
|
367 |
45732
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 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
|
369 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
|
370 $ 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
|
371 $ 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
|
372 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
|
373 $ 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
|
374 $ 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
|
375 $ 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
|
376 rev linkrev nodeid p1 p2 |
46531
d46885119f90
test-copies: don't use empty file for "same content" cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46527
diff
changeset
|
377 0 2 d8252ab2e760 000000000000 000000000000 (no-changeset !) |
d46885119f90
test-copies: don't use empty file for "same content" cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46527
diff
changeset
|
378 0 2 ae258f702dfe 000000000000 000000000000 (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
|
379 1 8 b004912a8510 000000000000 000000000000 |
46531
d46885119f90
test-copies: don't use empty file for "same content" cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46527
diff
changeset
|
380 2 22 7b79e2fe0c89 000000000000 000000000000 (no-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
|
381 $ hg up 'desc("b-1")' |
46527
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
382 3 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !) |
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
383 2 files updated, 0 files merged, 0 files removed, 0 files unresolved (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
|
384 $ hg merge 'desc("f-2")' |
46527
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
385 1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !) |
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
386 0 files updated, 0 files merged, 1 files removed, 0 files unresolved (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
|
387 (branch merge, don't forget to commit) |
46532
c9f502721783
test-copies: use intermediate variable some commit descriptions
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46531
diff
changeset
|
388 $ hg ci -m "mBFm-0 $case_desc - one way" |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
389 $ 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
|
390 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
|
391 $ 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
|
392 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
|
393 (branch merge, don't forget to commit) |
46532
c9f502721783
test-copies: use intermediate variable some commit descriptions
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46531
diff
changeset
|
394 $ hg ci -m "mFBm-0 $case_desc - the other way" |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
395 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
|
396 $ hg log -G --rev '::(desc("mBFm")+desc("mFBm"))' |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
397 @ mFBm-0 simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - the other way |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
398 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
399 +---o mBFm-0 simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - one way |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
400 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
401 | o f-2: rename i -> 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
|
402 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
403 | o f-1: rename h -> i |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
404 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
405 o | b-1: b update |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
406 |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
407 o i-2: c -move-> 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
|
408 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
409 o i-1: a -move-> c |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
410 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
411 o i-0 initial commit: a b h |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
412 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
413 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
414 |
46543
f01696d45d1e
test-copies: add subcase titles for various "conflicting" information variant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46542
diff
changeset
|
415 Subcase: reset of the copy history on one side |
f01696d45d1e
test-copies: add subcase titles for various "conflicting" information variant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46542
diff
changeset
|
416 `````````````````````````````````````````````` |
f01696d45d1e
test-copies: add subcase titles for various "conflicting" information variant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46542
diff
changeset
|
417 |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
418 Merge: |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
419 - 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
|
420 - 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
|
421 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
422 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
|
423 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
|
424 |
46537
1e96fdcc8bc1
test-copies: improve description of the D+G case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46536
diff
changeset
|
425 $ case_desc="actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content" |
46532
c9f502721783
test-copies: use intermediate variable some commit descriptions
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46531
diff
changeset
|
426 |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
427 $ hg up 'desc("i-2")' |
46527
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
428 3 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !) |
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
429 2 files updated, 0 files merged, 0 files removed, 0 files unresolved (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
|
430 $ 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
|
431 $ 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
|
432 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
|
433 $ 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
|
434 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
|
435 $ 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
|
436 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
|
437 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
|
438 (branch merge, don't forget to commit) |
46532
c9f502721783
test-copies: use intermediate variable some commit descriptions
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46531
diff
changeset
|
439 $ hg ci -m "mDGm-0 $case_desc - one way" |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
440 $ 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
|
441 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
|
442 $ 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
|
443 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
|
444 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
|
445 (branch merge, don't forget to commit) |
46532
c9f502721783
test-copies: use intermediate variable some commit descriptions
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46531
diff
changeset
|
446 $ hg ci -m "mGDm-0 $case_desc - the other way" |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
447 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
|
448 $ hg log -G --rev '::(desc("mDGm")+desc("mGDm"))' |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
449 @ mGDm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - the other way |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
450 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
451 +---o mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
452 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
453 | o g-1: update 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
|
454 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
455 o | d-2 re-add 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
|
456 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
457 o | d-1 delete 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
|
458 |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
459 o i-2: c -move-> 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
|
460 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
461 o i-1: a -move-> c |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
462 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
463 o i-0 initial commit: a b h |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
464 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
465 |
46543
f01696d45d1e
test-copies: add subcase titles for various "conflicting" information variant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46542
diff
changeset
|
466 Subcase: merging a change to a file with a "copy overwrite" to that file from another branch |
f01696d45d1e
test-copies: add subcase titles for various "conflicting" information variant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46542
diff
changeset
|
467 ```````````````````````````````````````````````````````````````````````````````````````````` |
45732
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 Merge: |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
470 - 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
|
471 - 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
|
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 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
|
474 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
|
475 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
476 Note: |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
477 | 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
|
478 | "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
|
479 | |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
480 | 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
|
481 |
46538
2f99dedf96b1
test-copies: improve description of the G+F case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46537
diff
changeset
|
482 $ case_desc="merge - G side: content change, F side: copy overwrite, no content change" |
46532
c9f502721783
test-copies: use intermediate variable some commit descriptions
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46531
diff
changeset
|
483 |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
484 $ 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
|
485 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
|
486 $ hg merge 'desc("g-1")' --tool :union |
46527
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
487 merging d (no-changeset !) |
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
488 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (no-changeset !) |
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
489 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (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
|
490 (branch merge, don't forget to commit) |
46532
c9f502721783
test-copies: use intermediate variable some commit descriptions
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46531
diff
changeset
|
491 $ hg ci -m "mFGm-0 $case_desc - one way" |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
492 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
|
493 $ hg up 'desc("g-1")' |
46527
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
494 2 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !) |
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
495 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (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
|
496 $ hg merge 'desc("f-2")' --tool :union |
46527
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
497 merging d (no-changeset !) |
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
498 0 files updated, 1 files merged, 1 files removed, 0 files unresolved (no-changeset !) |
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
499 0 files updated, 0 files merged, 1 files removed, 0 files unresolved (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
|
500 (branch merge, don't forget to commit) |
46532
c9f502721783
test-copies: use intermediate variable some commit descriptions
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46531
diff
changeset
|
501 $ hg ci -m "mGFm-0 $case_desc - the other way" |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
502 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
|
503 $ hg log -G --rev '::(desc("mGFm")+desc("mFGm"))' |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
504 @ mGFm-0 merge - G side: content change, F side: copy overwrite, no content change - the other way |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
505 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
506 +---o mFGm-0 merge - G side: content change, F side: copy overwrite, no content change - one way |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
507 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
508 | o g-1: update 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
|
509 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
510 o | f-2: rename i -> 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
|
511 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
512 o | f-1: rename h -> i |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
513 |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
514 o i-2: c -move-> 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
|
515 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
516 o i-1: a -move-> c |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
517 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
518 o i-0 initial commit: a b h |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
519 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
520 |
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 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
|
523 ------------------------------------------------------------- |
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 Merge: |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
526 - 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
|
527 - 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
|
528 - 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
|
529 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
530 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
|
531 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
|
532 |
46539
a1a06dca6941
test-copies: improve description of the G+C case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46538
diff
changeset
|
533 $ case_desc="merge updated/deleted - revive the file (updated content)" |
a1a06dca6941
test-copies: improve description of the G+C case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46538
diff
changeset
|
534 |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
535 $ 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
|
536 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
|
537 $ 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
|
538 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
|
539 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
|
540 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
|
541 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
|
542 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
|
543 [1] |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
544 $ 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
|
545 (no more unresolved files) |
46539
a1a06dca6941
test-copies: improve description of the G+C case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46538
diff
changeset
|
546 $ hg ci -m "mCGm-0 $case_desc - one way" |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
547 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
|
548 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
549 $ 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
|
550 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
|
551 $ 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
|
552 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
|
553 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
|
554 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
|
555 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
|
556 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
|
557 [1] |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
558 $ 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
|
559 (no more unresolved files) |
46539
a1a06dca6941
test-copies: improve description of the G+C case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46538
diff
changeset
|
560 $ hg ci -m "mGCm-0 $case_desc - the other way" |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
561 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
|
562 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
563 $ hg log -G --rev '::(desc("mCGm")+desc("mGCm"))' |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
564 @ mGCm-0 merge updated/deleted - revive the file (updated content) - the other way |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
565 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
566 +---o mCGm-0 merge updated/deleted - revive the file (updated content) - one way |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
567 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
568 | o g-1: update 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
|
569 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
570 o | c-1 delete 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
|
571 |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
572 o i-2: c -move-> 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
|
573 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
574 o i-1: a -move-> c |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
575 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
576 o i-0 initial commit: a b h |
45732
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 |
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 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
581 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
|
582 -------------------------------------------------------- |
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 Merge: |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
585 - 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
|
586 - 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
|
587 - 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
|
588 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
589 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
|
590 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
|
591 |
46540
311a18777f45
test-copies: improve description of the B+C "revert/restore" case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46539
diff
changeset
|
592 $ case_desc="merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge)" |
311a18777f45
test-copies: improve description of the B+C "revert/restore" case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46539
diff
changeset
|
593 |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
594 $ 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
|
595 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
|
596 $ 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
|
597 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
|
598 (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
|
599 $ hg revert --rev 'desc("b-1")' d |
46540
311a18777f45
test-copies: improve description of the B+C "revert/restore" case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46539
diff
changeset
|
600 $ hg ci -m "mCB-revert-m-0 $case_desc - one way" |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
601 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
|
602 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
603 $ 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
|
604 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
|
605 $ 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
|
606 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
|
607 (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
|
608 $ hg revert --rev 'desc("b-1")' d |
46540
311a18777f45
test-copies: improve description of the B+C "revert/restore" case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46539
diff
changeset
|
609 $ hg ci -m "mBC-revert-m-0 $case_desc - the other way" |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
610 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
|
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 $ hg log -G --rev '::(desc("mCB-revert-m")+desc("mBC-revert-m"))' |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
613 @ mBC-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - the other way |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
614 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
615 +---o mCB-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - one way |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
616 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
617 | o c-1 delete 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
|
618 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
619 o | b-1: b update |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
620 |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
621 o i-2: c -move-> 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
|
622 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
623 o i-1: a -move-> c |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
624 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
625 o i-0 initial commit: a b h |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
626 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
627 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
628 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
629 $ 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
|
630 |
45798
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
631 Merging a branch where a rename was deleted with a branch where the same file was renamed |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
632 ------------------------------------------------------------------------------------------ |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
633 |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
634 Create a "conflicting" merge where `d` get removed on one branch before its |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
635 rename information actually conflict with the other branch. |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
636 |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
637 (the copy information from the branch that was not deleted should win). |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
638 |
46541
60c52bdb1784
test-copies: improve description of the C+H case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46540
diff
changeset
|
639 $ case_desc="simple merge - C side: d is the results of renames then deleted, H side: d is result of another rename (same content as the other branch)" |
60c52bdb1784
test-copies: improve description of the C+H case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46540
diff
changeset
|
640 |
45798
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
641 $ hg up 'desc("i-0")' |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
642 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
643 $ hg mv b d |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
644 $ hg ci -m "h-1: b -(move)-> d" |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
645 created new head |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
646 |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
647 $ hg up 'desc("c-1")' |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
648 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
649 $ hg merge 'desc("h-1")' |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
650 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
651 (branch merge, don't forget to commit) |
46541
60c52bdb1784
test-copies: improve description of the C+H case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46540
diff
changeset
|
652 $ hg ci -m "mCH-delete-before-conflict-m-0 $case_desc - one way" |
45798
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
653 |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
654 $ hg up 'desc("h-1")' |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
655 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
656 $ hg merge 'desc("c-1")' |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
657 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
658 (branch merge, don't forget to commit) |
46541
60c52bdb1784
test-copies: improve description of the C+H case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46540
diff
changeset
|
659 $ hg ci -m "mHC-delete-before-conflict-m-0 $case_desc - the other way" |
45798
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
660 created new head |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
661 $ hg log -G --rev '::(desc("mCH-delete-before-conflict-m")+desc("mHC-delete-before-conflict-m"))' |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
662 @ mHC-delete-before-conflict-m-0 simple merge - C side: d is the results of renames then deleted, H side: d is result of another rename (same content as the other branch) - the other way |
45798
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
663 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
664 +---o mCH-delete-before-conflict-m-0 simple merge - C side: d is the results of renames then deleted, H side: d is result of another rename (same content as the other branch) - one way |
45798
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
665 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
666 | o h-1: b -(move)-> d |
45798
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
667 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
668 o | c-1 delete d |
45798
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
669 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
670 o | i-2: c -move-> d |
45798
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
671 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
672 o | i-1: a -move-> c |
45798
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
673 |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
674 o i-0 initial commit: a b h |
45798
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
675 |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
676 |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
677 Decision from previous merge are properly chained with later merge |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
678 ------------------------------------------------------------------ |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
679 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
680 Subcase: chaining conflicting rename resolution |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
681 ``````````````````````````````````````````````` |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
682 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
683 The "mAEm" and "mEAm" case create a rename tracking conflict on file 'f'. We |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
684 add more change on the respective branch and merge again. These second merge |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
685 does not involve the file 'f' and the arbitration done within "mAEm" and "mEA" |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
686 about that file should stay unchanged. |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
687 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
688 $ case_desc="chained merges (conflict -> simple) - same content everywhere" |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
689 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
690 (extra unrelated changes) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
691 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
692 $ hg up 'desc("a-2")' |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
693 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
694 $ echo j > unrelated-j |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
695 $ hg add unrelated-j |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
696 $ hg ci -m 'j-1: unrelated changes (based on the "a" series of changes)' |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
697 created new head |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
698 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
699 $ hg up 'desc("e-2")' |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
700 2 files updated, 0 files merged, 2 files removed, 0 files unresolved (no-changeset !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
701 1 files updated, 0 files merged, 2 files removed, 0 files unresolved (changeset !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
702 $ echo k > unrelated-k |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
703 $ hg add unrelated-k |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
704 $ hg ci -m 'k-1: unrelated changes (based on "e" changes)' |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
705 created new head |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
706 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
707 (merge variant 1) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
708 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
709 $ hg up 'desc("mAEm")' |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
710 1 files updated, 0 files merged, 2 files removed, 0 files unresolved (no-changeset !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
711 0 files updated, 0 files merged, 2 files removed, 0 files unresolved (changeset !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
712 $ hg merge 'desc("k-1")' |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
713 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
714 (branch merge, don't forget to commit) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
715 $ hg ci -m "mAE,Km: $case_desc" |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
716 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
717 (merge variant 2) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
718 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
719 $ hg up 'desc("k-1")' |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
720 2 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
721 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
722 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
723 $ hg merge 'desc("mAEm")' |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
724 1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
725 0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
726 (branch merge, don't forget to commit) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
727 $ hg ci -m "mK,AEm: $case_desc" |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
728 created new head |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
729 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
730 (merge variant 3) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
731 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
732 $ hg up 'desc("mEAm")' |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
733 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
734 $ hg merge 'desc("j-1")' |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
735 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
736 (branch merge, don't forget to commit) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
737 $ hg ci -m "mEA,Jm: $case_desc" |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
738 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
739 (merge variant 4) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
740 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
741 $ hg up 'desc("j-1")' |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
742 2 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
743 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
744 $ hg merge 'desc("mEAm")' |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
745 1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
746 0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
747 (branch merge, don't forget to commit) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
748 $ hg ci -m "mJ,EAm: $case_desc" |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
749 created new head |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
750 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
751 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
752 $ hg log -G --rev '::(desc("mAE,Km") + desc("mK,AEm") + desc("mEA,Jm") + desc("mJ,EAm"))' |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
753 @ mJ,EAm: chained merges (conflict -> simple) - same content everywhere |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
754 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
755 +---o mEA,Jm: chained merges (conflict -> simple) - same content everywhere |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
756 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
757 | | o mK,AEm: chained merges (conflict -> simple) - same content everywhere |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
758 | | |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
759 | | +---o mAE,Km: chained merges (conflict -> simple) - same content everywhere |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
760 | | | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
761 | | | o k-1: unrelated changes (based on "e" changes) |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
762 | | | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
763 | o | | j-1: unrelated changes (based on the "a" series of changes) |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
764 | | | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
765 o-----+ mEAm-0 merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f) - the other way |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
766 |/ / / |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
767 | o / mAEm-0 merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f) - one way |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
768 |/|/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
769 | o e-2 g -move-> f |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
770 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
771 | o e-1 b -move-> g |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
772 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
773 o | a-2: e -move-> f |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
774 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
775 o | a-1: d -move-> e |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
776 |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
777 o i-2: c -move-> d |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
778 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
779 o i-1: a -move-> c |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
780 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
781 o i-0 initial commit: a b h |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
782 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
783 |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
784 Subcase: chaining salvage information during a merge |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
785 ```````````````````````````````````````````````````` |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
786 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
787 We add more change on the branch were the file was deleted. merging again |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
788 should preserve the fact eh file was salvaged. |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
789 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
790 $ case_desc="chained merges (salvaged -> simple) - same content (when the file exists)" |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
791 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
792 (creating the change) |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
793 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
794 $ hg up 'desc("c-1")' |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
795 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
796 $ echo l > unrelated-l |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
797 $ hg add unrelated-l |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
798 $ hg ci -m 'l-1: unrelated changes (based on "c" changes)' |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
799 created new head |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
800 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
801 (Merge variant 1) |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
802 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
803 $ hg up 'desc("mBC-revert-m")' |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
804 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
805 $ hg merge 'desc("l-1")' |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
806 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
807 (branch merge, don't forget to commit) |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
808 $ hg ci -m "mBC+revert,Lm: $case_desc" |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
809 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
810 (Merge variant 2) |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
811 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
812 $ hg up 'desc("mCB-revert-m")' |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
813 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
814 $ hg merge 'desc("l-1")' |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
815 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
816 (branch merge, don't forget to commit) |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
817 $ hg ci -m "mCB+revert,Lm: $case_desc" |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
818 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
819 (Merge variant 3) |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
820 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
821 $ hg up 'desc("l-1")' |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
822 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
823 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
824 $ hg merge 'desc("mBC-revert-m")' |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
825 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
826 (branch merge, don't forget to commit) |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
827 $ hg ci -m "mL,BC+revertm: $case_desc" |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
828 created new head |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
829 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
830 (Merge variant 4) |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
831 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
832 $ hg up 'desc("l-1")' |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
833 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
834 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
835 $ hg merge 'desc("mCB-revert-m")' |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
836 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
837 (branch merge, don't forget to commit) |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
838 $ hg ci -m "mL,CB+revertm: $case_desc" |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
839 created new head |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
840 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
841 $ hg log -G --rev '::(desc("mBC+revert,Lm") + desc("mCB+revert,Lm") + desc("mL,BC+revertm") + desc("mL,CB+revertm"))' |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
842 @ mL,CB+revertm: chained merges (salvaged -> simple) - same content (when the file exists) |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
843 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
844 | | o mL,BC+revertm: chained merges (salvaged -> simple) - same content (when the file exists) |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
845 | |/| |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
846 +-+---o mCB+revert,Lm: chained merges (salvaged -> simple) - same content (when the file exists) |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
847 | | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
848 | +---o mBC+revert,Lm: chained merges (salvaged -> simple) - same content (when the file exists) |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
849 | | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
850 | o | l-1: unrelated changes (based on "c" changes) |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
851 | | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
852 | | o mBC-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - the other way |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
853 | |/| |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
854 o---+ mCB-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - one way |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
855 |/ / |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
856 o | c-1 delete d |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
857 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
858 | o b-1: b update |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
859 |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
860 o i-2: c -move-> d |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
861 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
862 o i-1: a -move-> c |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
863 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
864 o i-0 initial commit: a b h |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
865 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
866 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
867 |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
868 Subcase: chaining "merged" information during a merge |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
869 `````````````````````````````````````````````````````` |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
870 |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
871 When a non-rename change are merged with a copy overwrite, the merge pick the copy source from (p1) as the reference. We should preserve this information in subsequent merges. |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
872 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
873 $ case_desc="chained merges (copy-overwrite -> simple) - same content" |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
874 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
875 (extra unrelated changes) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
876 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
877 $ hg up 'desc("f-2")' |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
878 2 files updated, 0 files merged, 2 files removed, 0 files unresolved (no-changeset !) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
879 1 files updated, 0 files merged, 2 files removed, 0 files unresolved (changeset !) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
880 $ echo n > unrelated-n |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
881 $ hg add unrelated-n |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
882 $ hg ci -m 'n-1: unrelated changes (based on the "f" series of changes)' |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
883 created new head |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
884 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
885 $ hg up 'desc("g-1")' |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
886 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
887 $ echo o > unrelated-o |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
888 $ hg add unrelated-o |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
889 $ hg ci -m 'o-1: unrelated changes (based on "g" changes)' |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
890 created new head |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
891 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
892 (merge variant 1) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
893 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
894 $ hg up 'desc("mFGm")' |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
895 1 files updated, 0 files merged, 2 files removed, 0 files unresolved (no-changeset !) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
896 0 files updated, 0 files merged, 2 files removed, 0 files unresolved (changeset !) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
897 $ hg merge 'desc("o-1")' |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
898 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
899 (branch merge, don't forget to commit) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
900 $ hg ci -m "mFG,Om: $case_desc" |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
901 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
902 (merge variant 2) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
903 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
904 $ hg up 'desc("o-1")' |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
905 2 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
906 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
907 $ hg merge 'desc("FGm")' |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
908 1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
909 0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
910 (branch merge, don't forget to commit) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
911 $ hg ci -m "mO,FGm: $case_desc" |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
912 created new head |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
913 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
914 (merge variant 3) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
915 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
916 $ hg up 'desc("mGFm")' |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
917 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
918 $ hg merge 'desc("n-1")' |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
919 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
920 (branch merge, don't forget to commit) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
921 $ hg ci -m "mGF,Nm: $case_desc" |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
922 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
923 (merge variant 4) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
924 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
925 $ hg up 'desc("n-1")' |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
926 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
927 $ hg merge 'desc("mGFm")' |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
928 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
929 (branch merge, don't forget to commit) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
930 $ hg ci -m "mN,GFm: $case_desc" |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
931 created new head |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
932 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
933 $ hg log -G --rev '::(desc("mFG,Om") + desc("mO,FGm") + desc("mGF,Nm") + desc("mN,GFm"))' |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
934 @ mN,GFm: chained merges (copy-overwrite -> simple) - same content |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
935 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
936 +---o mGF,Nm: chained merges (copy-overwrite -> simple) - same content |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
937 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
938 | | o mO,FGm: chained merges (copy-overwrite -> simple) - same content |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
939 | | |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
940 | | +---o mFG,Om: chained merges (copy-overwrite -> simple) - same content |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
941 | | | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
942 | | | o o-1: unrelated changes (based on "g" changes) |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
943 | | | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
944 | o | | n-1: unrelated changes (based on the "f" series of changes) |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
945 | | | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
946 o-----+ mGFm-0 merge - G side: content change, F side: copy overwrite, no content change - the other way |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
947 |/ / / |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
948 | o / mFGm-0 merge - G side: content change, F side: copy overwrite, no content change - one way |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
949 |/|/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
950 | o g-1: update d |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
951 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
952 o | f-2: rename i -> d |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
953 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
954 o | f-1: rename h -> i |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
955 |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
956 o i-2: c -move-> d |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
957 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
958 o i-1: a -move-> c |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
959 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
960 o i-0 initial commit: a b h |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
961 |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
962 |
46185
5f00eb608957
copies-tests: add a summary of all cases created in test-copies-chain-merge.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46160
diff
changeset
|
963 Summary of all created cases |
5f00eb608957
copies-tests: add a summary of all cases created in test-copies-chain-merge.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46160
diff
changeset
|
964 ---------------------------- |
5f00eb608957
copies-tests: add a summary of all cases created in test-copies-chain-merge.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46160
diff
changeset
|
965 |
46186
5f27924a201d
copies-tests: update to null in test-copies-chain-merge.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46185
diff
changeset
|
966 $ hg up --quiet null |
5f27924a201d
copies-tests: update to null in test-copies-chain-merge.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46185
diff
changeset
|
967 |
46185
5f00eb608957
copies-tests: add a summary of all cases created in test-copies-chain-merge.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46160
diff
changeset
|
968 (This exists to help keeping a compact list of the various cases we have built) |
5f00eb608957
copies-tests: add a summary of all cases created in test-copies-chain-merge.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46160
diff
changeset
|
969 |
5f00eb608957
copies-tests: add a summary of all cases created in test-copies-chain-merge.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46160
diff
changeset
|
970 $ hg log -T '{desc|firstline}\n'| sort |
5f00eb608957
copies-tests: add a summary of all cases created in test-copies-chain-merge.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46160
diff
changeset
|
971 a-1: d -move-> e |
5f00eb608957
copies-tests: add a summary of all cases created in test-copies-chain-merge.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46160
diff
changeset
|
972 a-2: e -move-> f |
5f00eb608957
copies-tests: add a summary of all cases created in test-copies-chain-merge.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46160
diff
changeset
|
973 b-1: b update |
5f00eb608957
copies-tests: add a summary of all cases created in test-copies-chain-merge.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46160
diff
changeset
|
974 c-1 delete d |
5f00eb608957
copies-tests: add a summary of all cases created in test-copies-chain-merge.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46160
diff
changeset
|
975 d-1 delete d |
5f00eb608957
copies-tests: add a summary of all cases created in test-copies-chain-merge.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46160
diff
changeset
|
976 d-2 re-add d |
5f00eb608957
copies-tests: add a summary of all cases created in test-copies-chain-merge.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46160
diff
changeset
|
977 e-1 b -move-> g |
5f00eb608957
copies-tests: add a summary of all cases created in test-copies-chain-merge.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46160
diff
changeset
|
978 e-2 g -move-> f |
5f00eb608957
copies-tests: add a summary of all cases created in test-copies-chain-merge.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46160
diff
changeset
|
979 f-1: rename h -> i |
5f00eb608957
copies-tests: add a summary of all cases created in test-copies-chain-merge.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46160
diff
changeset
|
980 f-2: rename i -> d |
5f00eb608957
copies-tests: add a summary of all cases created in test-copies-chain-merge.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46160
diff
changeset
|
981 g-1: update d |
5f00eb608957
copies-tests: add a summary of all cases created in test-copies-chain-merge.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46160
diff
changeset
|
982 h-1: b -(move)-> d |
5f00eb608957
copies-tests: add a summary of all cases created in test-copies-chain-merge.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46160
diff
changeset
|
983 i-0 initial commit: a b h |
5f00eb608957
copies-tests: add a summary of all cases created in test-copies-chain-merge.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46160
diff
changeset
|
984 i-1: a -move-> c |
5f00eb608957
copies-tests: add a summary of all cases created in test-copies-chain-merge.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46160
diff
changeset
|
985 i-2: c -move-> d |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
986 j-1: unrelated changes (based on the "a" series of changes) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
987 k-1: unrelated changes (based on "e" changes) |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
988 l-1: unrelated changes (based on "c" changes) |
46533
e20977208924
test-copies: improve description of the A+B case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46532
diff
changeset
|
989 mABm-0 simple merge - A side: multiple renames, B side: unrelated update - the other way |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
990 mAE,Km: chained merges (conflict -> simple) - same content everywhere |
46536
19f490690880
test-copies: improve description of the A+E case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46535
diff
changeset
|
991 mAEm-0 merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f) - one way |
46533
e20977208924
test-copies: improve description of the A+B case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46532
diff
changeset
|
992 mBAm-0 simple merge - A side: multiple renames, B side: unrelated update - one way |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
993 mBC+revert,Lm: chained merges (salvaged -> simple) - same content (when the file exists) |
46540
311a18777f45
test-copies: improve description of the B+C "revert/restore" case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46539
diff
changeset
|
994 mBC-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - the other way |
46534
979838adc46b
test-copies: improve description of the B+C case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46533
diff
changeset
|
995 mBCm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - one way |
46185
5f00eb608957
copies-tests: add a summary of all cases created in test-copies-chain-merge.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46160
diff
changeset
|
996 mBCm-1 re-add d |
46535
9a58f9eed303
test-copies: improve description of the B+D case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46534
diff
changeset
|
997 mBDm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - one way |
46542
f8888f5c8c50
test-copies: improve description of the B+F case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46541
diff
changeset
|
998 mBFm-0 simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - one way |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
999 mCB+revert,Lm: chained merges (salvaged -> simple) - same content (when the file exists) |
46540
311a18777f45
test-copies: improve description of the B+C "revert/restore" case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46539
diff
changeset
|
1000 mCB-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - one way |
46534
979838adc46b
test-copies: improve description of the B+C case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46533
diff
changeset
|
1001 mCBm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - the other way |
46185
5f00eb608957
copies-tests: add a summary of all cases created in test-copies-chain-merge.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46160
diff
changeset
|
1002 mCBm-1 re-add d |
46539
a1a06dca6941
test-copies: improve description of the G+C case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46538
diff
changeset
|
1003 mCGm-0 merge updated/deleted - revive the file (updated content) - one way |
46541
60c52bdb1784
test-copies: improve description of the C+H case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46540
diff
changeset
|
1004 mCH-delete-before-conflict-m-0 simple merge - C side: d is the results of renames then deleted, H side: d is result of another rename (same content as the other branch) - one way |
46535
9a58f9eed303
test-copies: improve description of the B+D case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46534
diff
changeset
|
1005 mDBm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - the other way |
46537
1e96fdcc8bc1
test-copies: improve description of the D+G case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46536
diff
changeset
|
1006 mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1007 mEA,Jm: chained merges (conflict -> simple) - same content everywhere |
46536
19f490690880
test-copies: improve description of the A+E case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46535
diff
changeset
|
1008 mEAm-0 merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f) - the other way |
46542
f8888f5c8c50
test-copies: improve description of the B+F case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46541
diff
changeset
|
1009 mFBm-0 simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - the other way |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1010 mFG,Om: chained merges (copy-overwrite -> simple) - same content |
46538
2f99dedf96b1
test-copies: improve description of the G+F case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46537
diff
changeset
|
1011 mFGm-0 merge - G side: content change, F side: copy overwrite, no content change - one way |
46539
a1a06dca6941
test-copies: improve description of the G+C case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46538
diff
changeset
|
1012 mGCm-0 merge updated/deleted - revive the file (updated content) - the other way |
46537
1e96fdcc8bc1
test-copies: improve description of the D+G case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46536
diff
changeset
|
1013 mGDm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - the other way |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1014 mGF,Nm: chained merges (copy-overwrite -> simple) - same content |
46538
2f99dedf96b1
test-copies: improve description of the G+F case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46537
diff
changeset
|
1015 mGFm-0 merge - G side: content change, F side: copy overwrite, no content change - the other way |
46541
60c52bdb1784
test-copies: improve description of the C+H case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46540
diff
changeset
|
1016 mHC-delete-before-conflict-m-0 simple merge - C side: d is the results of renames then deleted, H side: d is result of another rename (same content as the other branch) - the other way |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1017 mJ,EAm: chained merges (conflict -> simple) - same content everywhere |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1018 mK,AEm: chained merges (conflict -> simple) - same content everywhere |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1019 mL,BC+revertm: chained merges (salvaged -> simple) - same content (when the file exists) |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1020 mL,CB+revertm: chained merges (salvaged -> simple) - same content (when the file exists) |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1021 mN,GFm: chained merges (copy-overwrite -> simple) - same content |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1022 mO,FGm: chained merges (copy-overwrite -> simple) - same content |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1023 n-1: unrelated changes (based on the "f" series of changes) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1024 o-1: unrelated changes (based on "g" changes) |
46185
5f00eb608957
copies-tests: add a summary of all cases created in test-copies-chain-merge.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46160
diff
changeset
|
1025 |
5f00eb608957
copies-tests: add a summary of all cases created in test-copies-chain-merge.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46160
diff
changeset
|
1026 |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1027 Test that sidedata computations during upgrades are correct |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1028 =========================================================== |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1029 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1030 We upgrade a repository that is not using sidedata (the filelog case) and |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1031 check that the same side data have been generated as if they were computed at |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1032 commit time. |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1033 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1034 |
45735
edf4fa06df94
upgrade: allow sidedata upgrade to modify revision flag
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45733
diff
changeset
|
1035 #if upgraded |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1036 $ cat >> $HGRCPATH << EOF |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1037 > [format] |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1038 > exp-use-side-data = yes |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1039 > exp-use-copies-side-data-changeset = yes |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1040 > EOF |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1041 $ hg debugformat -v |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1042 format-variant repo config default |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1043 fncache: yes yes yes |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1044 dotencode: yes yes yes |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1045 generaldelta: yes yes yes |
46334
4b0192f592cf
share: move share safe functionality out of experimental
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46186
diff
changeset
|
1046 share-safe: no no no |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1047 sparserevlog: yes yes yes |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1048 sidedata: no yes no |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1049 persistent-nodemap: no no no |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1050 copies-sdc: no yes no |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1051 plain-cl-delta: yes yes yes |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1052 compression: * (glob) |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1053 compression-level: default default default |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1054 $ hg debugupgraderepo --run --quiet |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1055 upgrade will perform the following actions: |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1056 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1057 requirements |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1058 preserved: * (glob) |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1059 added: exp-copies-sidedata-changeset, exp-sidedata-flag |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1060 |
46035
6c960b708ac4
upgrade: display the list of processed revlog before proceeding
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46002
diff
changeset
|
1061 processed revlogs: |
6c960b708ac4
upgrade: display the list of processed revlog before proceeding
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46002
diff
changeset
|
1062 - all-filelogs |
6c960b708ac4
upgrade: display the list of processed revlog before proceeding
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46002
diff
changeset
|
1063 - changelog |
6c960b708ac4
upgrade: display the list of processed revlog before proceeding
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46002
diff
changeset
|
1064 - manifest |
6c960b708ac4
upgrade: display the list of processed revlog before proceeding
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46002
diff
changeset
|
1065 |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1066 #endif |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1067 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1068 |
45735
edf4fa06df94
upgrade: allow sidedata upgrade to modify revision flag
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45733
diff
changeset
|
1069 #if no-compatibility no-filelog no-changeset |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1070 |
46479
c2435280ca63
copy-tracing: add a --compute flag to debugchangedfiles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46334
diff
changeset
|
1071 $ hg debugchangedfiles --compute 0 |
c2435280ca63
copy-tracing: add a --compute flag to debugchangedfiles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46334
diff
changeset
|
1072 added : a, ; |
c2435280ca63
copy-tracing: add a --compute flag to debugchangedfiles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46334
diff
changeset
|
1073 added : b, ; |
c2435280ca63
copy-tracing: add a --compute flag to debugchangedfiles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46334
diff
changeset
|
1074 added : h, ; |
c2435280ca63
copy-tracing: add a --compute flag to debugchangedfiles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46334
diff
changeset
|
1075 |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1076 $ for rev in `hg log --rev 'all()' -T '{rev}\n'`; do |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1077 > case_id=`hg log -r $rev -T '{word(0, desc, ":")}\n'` |
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1078 > echo "##### revision \"$case_id\" #####" |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1079 > hg debugsidedata -c -v -- $rev |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1080 > hg debugchangedfiles $rev |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1081 > done |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1082 ##### revision "i-0 initial commit" ##### |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1083 1 sidedata entries |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1084 entry-0014 size 34 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1085 '\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' |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1086 added : a, ; |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1087 added : b, ; |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1088 added : h, ; |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1089 ##### revision "i-1" ##### |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1090 1 sidedata entries |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1091 entry-0014 size 24 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1092 '\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00ac' |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1093 removed : a, ; |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1094 added p1: c, a; |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1095 ##### revision "i-2" ##### |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1096 1 sidedata entries |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1097 entry-0014 size 24 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1098 '\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00cd' |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1099 removed : c, ; |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1100 added p1: d, c; |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1101 ##### revision "a-1" ##### |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1102 1 sidedata entries |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1103 entry-0014 size 24 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1104 '\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00de' |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1105 removed : d, ; |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1106 added p1: e, d; |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1107 ##### revision "a-2" ##### |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1108 1 sidedata entries |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1109 entry-0014 size 24 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1110 '\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00ef' |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1111 removed : e, ; |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1112 added p1: f, e; |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1113 ##### revision "b-1" ##### |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1114 1 sidedata entries |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1115 entry-0014 size 14 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1116 '\x00\x00\x00\x01\x14\x00\x00\x00\x01\x00\x00\x00\x00b' |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1117 touched : b, ; |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1118 ##### revision "c-1 delete d" ##### |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1119 1 sidedata entries |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1120 entry-0014 size 14 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1121 '\x00\x00\x00\x01\x0c\x00\x00\x00\x01\x00\x00\x00\x00d' |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1122 removed : d, ; |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1123 ##### revision "d-1 delete d" ##### |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1124 1 sidedata entries |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1125 entry-0014 size 14 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1126 '\x00\x00\x00\x01\x0c\x00\x00\x00\x01\x00\x00\x00\x00d' |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1127 removed : d, ; |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1128 ##### revision "d-2 re-add d" ##### |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1129 1 sidedata entries |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1130 entry-0014 size 14 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1131 '\x00\x00\x00\x01\x04\x00\x00\x00\x01\x00\x00\x00\x00d' |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1132 added : d, ; |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1133 ##### revision "e-1 b -move-> g" ##### |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1134 1 sidedata entries |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1135 entry-0014 size 24 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1136 '\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00bg' |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1137 removed : b, ; |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1138 added p1: g, b; |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1139 ##### revision "e-2 g -move-> f" ##### |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1140 1 sidedata entries |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1141 entry-0014 size 24 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1142 '\x00\x00\x00\x02\x06\x00\x00\x00\x01\x00\x00\x00\x01\x0c\x00\x00\x00\x02\x00\x00\x00\x00fg' |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1143 added p1: f, g; |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1144 removed : g, ; |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1145 ##### revision "mBAm-0 simple merge - A side" ##### |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1146 1 sidedata entries |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1147 entry-0014 size 4 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1148 '\x00\x00\x00\x00' |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1149 ##### revision "mABm-0 simple merge - A side" ##### |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1150 1 sidedata entries |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1151 entry-0014 size 4 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1152 '\x00\x00\x00\x00' |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1153 ##### revision "mBCm-0 simple merge - C side" ##### |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1154 1 sidedata entries |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1155 entry-0014 size 4 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1156 '\x00\x00\x00\x00' |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1157 ##### revision "mBCm-1 re-add d" ##### |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1158 1 sidedata entries |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1159 entry-0014 size 14 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1160 '\x00\x00\x00\x01\x04\x00\x00\x00\x01\x00\x00\x00\x00d' |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1161 added : d, ; |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1162 ##### revision "mCBm-0 simple merge - C side" ##### |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1163 1 sidedata entries |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1164 entry-0014 size 4 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1165 '\x00\x00\x00\x00' |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1166 ##### revision "mCBm-1 re-add d" ##### |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1167 1 sidedata entries |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1168 entry-0014 size 14 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1169 '\x00\x00\x00\x01\x04\x00\x00\x00\x01\x00\x00\x00\x00d' |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1170 added : d, ; |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1171 ##### revision "mBDm-0 simple merge - B side" ##### |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1172 1 sidedata entries |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1173 entry-0014 size 4 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1174 '\x00\x00\x00\x00' |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1175 ##### revision "mDBm-0 simple merge - B side" ##### |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1176 1 sidedata entries |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1177 entry-0014 size 4 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1178 '\x00\x00\x00\x00' |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1179 ##### revision "mAEm-0 merge with copies info on both side - A side" ##### |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1180 1 sidedata entries |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1181 entry-0014 size 14 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1182 '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00f' |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1183 merged : f, ; |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1184 ##### revision "mEAm-0 merge with copies info on both side - A side" ##### |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1185 1 sidedata entries |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1186 entry-0014 size 14 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1187 '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00f' |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1188 merged : f, ; |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1189 ##### revision "f-1" ##### |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1190 1 sidedata entries |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1191 entry-0014 size 24 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1192 '\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00hi' |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1193 removed : h, ; |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1194 added p1: i, h; |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1195 ##### revision "f-2" ##### |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1196 1 sidedata entries |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1197 entry-0014 size 24 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1198 '\x00\x00\x00\x02\x16\x00\x00\x00\x01\x00\x00\x00\x01\x0c\x00\x00\x00\x02\x00\x00\x00\x00di' |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1199 touched p1: d, i; |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1200 removed : i, ; |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1201 ##### revision "mBFm-0 simple merge - B side" ##### |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1202 1 sidedata entries |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1203 entry-0014 size 4 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1204 '\x00\x00\x00\x00' |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1205 ##### revision "mFBm-0 simple merge - B side" ##### |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1206 1 sidedata entries |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1207 entry-0014 size 4 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1208 '\x00\x00\x00\x00' |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1209 ##### revision "g-1" ##### |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1210 1 sidedata entries |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1211 entry-0014 size 14 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1212 '\x00\x00\x00\x01\x14\x00\x00\x00\x01\x00\x00\x00\x00d' |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1213 touched : d, ; |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1214 ##### revision "mDGm-0 actual content merge, copies on one side - D side" ##### |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1215 1 sidedata entries |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1216 entry-0014 size 14 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1217 '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1218 merged : d, ; |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1219 ##### revision "mGDm-0 actual content merge, copies on one side - D side" ##### |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1220 1 sidedata entries |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1221 entry-0014 size 14 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1222 '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1223 merged : d, ; |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1224 ##### revision "mFGm-0 merge - G side" ##### |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1225 1 sidedata entries |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1226 entry-0014 size 14 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1227 '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1228 merged : d, ; |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1229 ##### revision "mGFm-0 merge - G side" ##### |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1230 1 sidedata entries |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1231 entry-0014 size 14 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1232 '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1233 merged : d, ; |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1234 ##### revision "mCGm-0 merge updated/deleted - revive the file (updated content) - one way" ##### |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1235 1 sidedata entries |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1236 entry-0014 size 14 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1237 '\x00\x00\x00\x01\x10\x00\x00\x00\x01\x00\x00\x00\x00d' |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1238 salvaged : d, ; |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1239 ##### revision "mGCm-0 merge updated/deleted - revive the file (updated content) - the other way" ##### |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1240 1 sidedata entries |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1241 entry-0014 size 14 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1242 '\x00\x00\x00\x01\x10\x00\x00\x00\x01\x00\x00\x00\x00d' |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1243 salvaged : d, ; |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1244 ##### revision "mCB-revert-m-0 merge explicitely revive deleted file - B side" ##### |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1245 1 sidedata entries |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1246 entry-0014 size 14 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1247 '\x00\x00\x00\x01\x10\x00\x00\x00\x01\x00\x00\x00\x00d' |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1248 salvaged : d, ; |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1249 ##### revision "mBC-revert-m-0 merge explicitely revive deleted file - B side" ##### |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1250 1 sidedata entries |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1251 entry-0014 size 14 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1252 '\x00\x00\x00\x01\x10\x00\x00\x00\x01\x00\x00\x00\x00d' |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1253 salvaged : d, ; |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1254 ##### revision "h-1" ##### |
45798
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
1255 1 sidedata entries |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
1256 entry-0014 size 24 |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
1257 '\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00bd' |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
1258 removed : b, ; |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
1259 added p1: d, b; |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1260 ##### revision "mCH-delete-before-conflict-m-0 simple merge - C side" ##### |
45798
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
1261 1 sidedata entries |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
1262 entry-0014 size 4 |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
1263 '\x00\x00\x00\x00' |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1264 ##### revision "mHC-delete-before-conflict-m-0 simple merge - C side" ##### |
45798
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
1265 1 sidedata entries |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
1266 entry-0014 size 4 |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
1267 '\x00\x00\x00\x00' |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1268 ##### revision "j-1" ##### |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1269 1 sidedata entries |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1270 entry-0014 size 24 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1271 '\x00\x00\x00\x01\x04\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-j' |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1272 added : unrelated-j, ; |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1273 ##### revision "k-1" ##### |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1274 1 sidedata entries |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1275 entry-0014 size 24 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1276 '\x00\x00\x00\x01\x04\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-k' |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1277 added : unrelated-k, ; |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1278 ##### revision "mAE,Km" ##### |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1279 1 sidedata entries |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1280 entry-0014 size 4 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1281 '\x00\x00\x00\x00' |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1282 ##### revision "mK,AEm" ##### |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1283 1 sidedata entries |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1284 entry-0014 size 4 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1285 '\x00\x00\x00\x00' |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1286 ##### revision "mEA,Jm" ##### |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1287 1 sidedata entries |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1288 entry-0014 size 4 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1289 '\x00\x00\x00\x00' |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1290 ##### revision "mJ,EAm" ##### |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1291 1 sidedata entries |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1292 entry-0014 size 4 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1293 '\x00\x00\x00\x00' |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1294 ##### revision "l-1" ##### |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1295 1 sidedata entries |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1296 entry-0014 size 24 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1297 '\x00\x00\x00\x01\x04\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-l' |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1298 added : unrelated-l, ; |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1299 ##### revision "mBC+revert,Lm" ##### |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1300 1 sidedata entries |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1301 entry-0014 size 4 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1302 '\x00\x00\x00\x00' |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1303 ##### revision "mCB+revert,Lm" ##### |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1304 1 sidedata entries |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1305 entry-0014 size 4 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1306 '\x00\x00\x00\x00' |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1307 ##### revision "mL,BC+revertm" ##### |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1308 1 sidedata entries |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1309 entry-0014 size 4 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1310 '\x00\x00\x00\x00' |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1311 ##### revision "mL,CB+revertm" ##### |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1312 1 sidedata entries |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1313 entry-0014 size 4 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1314 '\x00\x00\x00\x00' |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1315 ##### revision "n-1" ##### |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1316 1 sidedata entries |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1317 entry-0014 size 24 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1318 '\x00\x00\x00\x01\x04\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-n' |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1319 added : unrelated-n, ; |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1320 ##### revision "o-1" ##### |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1321 1 sidedata entries |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1322 entry-0014 size 24 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1323 '\x00\x00\x00\x01\x04\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-o' |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1324 added : unrelated-o, ; |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1325 ##### revision "mFG,Om" ##### |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1326 1 sidedata entries |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1327 entry-0014 size 4 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1328 '\x00\x00\x00\x00' |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1329 ##### revision "mO,FGm" ##### |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1330 1 sidedata entries |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1331 entry-0014 size 4 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1332 '\x00\x00\x00\x00' |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1333 ##### revision "mGF,Nm" ##### |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1334 1 sidedata entries |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1335 entry-0014 size 4 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1336 '\x00\x00\x00\x00' |
46551
cb15216a52f5
test-copies: use "case-id" instead of revision number when listing sidedata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46547
diff
changeset
|
1337 ##### revision "mN,GFm" ##### |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1338 1 sidedata entries |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1339 entry-0014 size 4 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1340 '\x00\x00\x00\x00' |
45733
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1341 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1342 #endif |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1343 |
ee3fd9021fac
test: move upgrade run and check earlier in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45732
diff
changeset
|
1344 |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
1345 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
|
1346 ============================== |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
1347 |
46159
929054848d6c
copies: properly match result during changeset centric copy tracing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46035
diff
changeset
|
1348 Check that matching only affect the destination and not intermediate path |
929054848d6c
copies: properly match result during changeset centric copy tracing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46035
diff
changeset
|
1349 ------------------------------------------------------------------------- |
929054848d6c
copies: properly match result during changeset centric copy tracing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46035
diff
changeset
|
1350 |
929054848d6c
copies: properly match result during changeset centric copy tracing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46035
diff
changeset
|
1351 The two status call should give the same value for f |
929054848d6c
copies: properly match result during changeset centric copy tracing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46035
diff
changeset
|
1352 |
929054848d6c
copies: properly match result during changeset centric copy tracing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46035
diff
changeset
|
1353 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("a-2")' |
929054848d6c
copies: properly match result during changeset centric copy tracing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46035
diff
changeset
|
1354 A f |
929054848d6c
copies: properly match result during changeset centric copy tracing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46035
diff
changeset
|
1355 a |
929054848d6c
copies: properly match result during changeset centric copy tracing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46035
diff
changeset
|
1356 R a |
929054848d6c
copies: properly match result during changeset centric copy tracing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46035
diff
changeset
|
1357 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("a-2")' f |
929054848d6c
copies: properly match result during changeset centric copy tracing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46035
diff
changeset
|
1358 A f |
929054848d6c
copies: properly match result during changeset centric copy tracing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46035
diff
changeset
|
1359 a (no-changeset no-compatibility !) |
929054848d6c
copies: properly match result during changeset centric copy tracing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46035
diff
changeset
|
1360 |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
1361 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
|
1362 --------------------------------------------------------------- |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
1363 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
1364 - 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
|
1365 - 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
|
1366 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
1367 $ hg log -G --rev '::(desc("mABm")+desc("mBAm"))' |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1368 o mABm-0 simple merge - A side: multiple renames, B side: unrelated update - the other way |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
1369 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1370 +---o mBAm-0 simple merge - A side: multiple renames, B side: unrelated update - one way |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
1371 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1372 | o b-1: b update |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
1373 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1374 o | a-2: e -move-> f |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
1375 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1376 o | a-1: d -move-> e |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
1377 |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1378 o i-2: c -move-> 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
|
1379 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1380 o i-1: a -move-> c |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
1381 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1382 o i-0 initial commit: a b h |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
1383 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
1384 |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1385 $ 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
|
1386 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
|
1387 d |
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1388 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
|
1389 $ 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
|
1390 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
|
1391 d |
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1392 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
|
1393 $ 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
|
1394 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
|
1395 $ 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
|
1396 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
|
1397 $ 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
|
1398 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
|
1399 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
|
1400 d |
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1401 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
|
1402 $ 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
|
1403 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
|
1404 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
|
1405 d |
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1406 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
|
1407 $ 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
|
1408 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
|
1409 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
|
1410 a |
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1411 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
|
1412 $ 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
|
1413 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
|
1414 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
|
1415 a |
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1416 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
|
1417 |
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1418 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
|
1419 ------------------------------------- |
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1420 |
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1421 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
|
1422 - 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
|
1423 - 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
|
1424 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
|
1425 |
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
|
1426 $ hg log -G --rev '::(desc("mCBm")+desc("mBCm"))' |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1427 o 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
|
1428 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1429 o mCBm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - 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
|
1430 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1431 | | o 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
|
1432 | | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1433 +---o mBCm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - 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
|
1434 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1435 | o 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
|
1436 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1437 o | 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
|
1438 |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1439 o 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
|
1440 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1441 o 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
|
1442 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1443 o 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
|
1444 |
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
|
1445 - 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
|
1446 |
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
|
1447 $ 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
|
1448 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
|
1449 $ 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
|
1450 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
|
1451 $ 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
|
1452 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
|
1453 $ 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
|
1454 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
|
1455 $ 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
|
1456 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
|
1457 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
|
1458 $ 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
|
1459 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
|
1460 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
|
1461 $ 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
|
1462 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
|
1463 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
|
1464 $ 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
|
1465 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
|
1466 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
|
1467 |
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
|
1468 - 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
|
1469 |
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
|
1470 $ 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
|
1471 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
|
1472 $ 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
|
1473 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
|
1474 $ 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
|
1475 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
|
1476 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
|
1477 $ 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
|
1478 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
|
1479 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
|
1480 $ 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
|
1481 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
|
1482 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
|
1483 $ 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
|
1484 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
|
1485 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
|
1486 $ 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
|
1487 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
|
1488 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
|
1489 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
|
1490 $ 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
|
1491 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
|
1492 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
|
1493 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
|
1494 |
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
|
1495 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
|
1496 --------------------------------------------------- |
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
|
1497 |
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
|
1498 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
|
1499 - 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
|
1500 - 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
|
1501 |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1502 $ hg log -G --rev '::(desc("mDBm")+desc("mBDm"))' |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1503 o mDBm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - 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
|
1504 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1505 +---o mBDm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - one 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
|
1506 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1507 | o d-2 re-add d |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1508 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1509 | o d-1 delete d |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1510 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1511 o | b-1: b update |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1512 |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1513 o i-2: c -move-> d |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1514 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1515 o i-1: a -move-> c |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1516 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1517 o i-0 initial commit: a b h |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1518 |
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
|
1519 $ 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
|
1520 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
|
1521 $ 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
|
1522 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
|
1523 $ 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
|
1524 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
|
1525 $ 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
|
1526 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
|
1527 $ 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
|
1528 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
|
1529 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
|
1530 $ 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
|
1531 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
|
1532 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
|
1533 |
44454
b8882f5d7cb4
copies-tests: update the analysis of the BD/DB cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44453
diff
changeset
|
1534 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
|
1535 |
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
|
1536 $ 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
|
1537 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
|
1538 $ 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
|
1539 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
|
1540 |
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
|
1541 $ 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
|
1542 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
|
1543 $ hg manifest --debug --rev 'desc("b-1")' | grep '644 d' |
46531
d46885119f90
test-copies: don't use empty file for "same content" cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46527
diff
changeset
|
1544 d8252ab2e760b0d4e5288fd44cbd15a0fa567e16 644 d (no-changeset !) |
d46885119f90
test-copies: don't use empty file for "same content" cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46527
diff
changeset
|
1545 ae258f702dfeca05bf9b6a22a97a4b5645570f11 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
|
1546 $ 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
|
1547 rev linkrev nodeid p1 p2 |
46531
d46885119f90
test-copies: don't use empty file for "same content" cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46527
diff
changeset
|
1548 0 2 d8252ab2e760 000000000000 000000000000 (no-changeset !) |
d46885119f90
test-copies: don't use empty file for "same content" cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46527
diff
changeset
|
1549 0 2 ae258f702dfe 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
|
1550 1 8 b004912a8510 000000000000 000000000000 |
46531
d46885119f90
test-copies: don't use empty file for "same content" cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46527
diff
changeset
|
1551 2 22 7b79e2fe0c89 000000000000 000000000000 (no-changeset !) |
d46885119f90
test-copies: don't use empty file for "same content" cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46527
diff
changeset
|
1552 2 25 5cce88bf349f ae258f702dfe 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
|
1553 |
45653
a357688e3c9c
tests: update/remove outdated comments in test-copies-chain-merge.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
45461
diff
changeset
|
1554 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
|
1555 |
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
|
1556 $ hg log -Gfr 'desc("mBDm-0")' d |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1557 o 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
|
1558 | |
44687
1b8fd4af3318
mergestate: store about files resolved in favour of other
Pulkit Goyal <7895pulkit@gmail.com>
parents:
44678
diff
changeset
|
1559 ~ |
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
|
1560 |
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
|
1561 $ hg log -Gfr 'desc("mDBm-0")' d |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1562 o 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
|
1563 | |
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
|
1564 ~ |
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
|
1565 |
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
|
1566 $ 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
|
1567 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
|
1568 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
|
1569 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
|
1570 $ 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
|
1571 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
|
1572 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
|
1573 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
|
1574 |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1575 |
44455
275365d85e3f
copies-tests: clarify the description of the EA/AE cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44454
diff
changeset
|
1576 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
|
1577 -------------------------------------------- |
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
|
1578 |
46543
f01696d45d1e
test-copies: add subcase titles for various "conflicting" information variant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46542
diff
changeset
|
1579 Subcase: new copy information on both side |
f01696d45d1e
test-copies: add subcase titles for various "conflicting" information variant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46542
diff
changeset
|
1580 `````````````````````````````````````````` |
f01696d45d1e
test-copies: add subcase titles for various "conflicting" information variant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46542
diff
changeset
|
1581 |
44455
275365d85e3f
copies-tests: clarify the description of the EA/AE cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44454
diff
changeset
|
1582 - 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
|
1583 - 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
|
1584 |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1585 $ hg log -G --rev '::(desc("mAEm")+desc("mEAm"))' |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1586 o mEAm-0 merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f) - 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
|
1587 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1588 +---o mAEm-0 merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f) - one 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
|
1589 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1590 | o e-2 g -move-> f |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1591 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1592 | o e-1 b -move-> g |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1593 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1594 o | a-2: e -move-> f |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1595 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1596 o | a-1: d -move-> e |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1597 |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1598 o i-2: c -move-> d |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1599 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1600 o i-1: a -move-> c |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1601 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1602 o i-0 initial commit: a b h |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1603 |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
1604 #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
|
1605 $ hg manifest --debug --rev 'desc("mAEm-0")' | grep '644 f' |
46531
d46885119f90
test-copies: don't use empty file for "same content" cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46527
diff
changeset
|
1606 2ff93c643948464ee1f871867910ae43a45b0bea 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
|
1607 $ hg manifest --debug --rev 'desc("mEAm-0")' | grep '644 f' |
46531
d46885119f90
test-copies: don't use empty file for "same content" cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46527
diff
changeset
|
1608 2ff93c643948464ee1f871867910ae43a45b0bea 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
|
1609 $ hg manifest --debug --rev 'desc("a-2")' | grep '644 f' |
46531
d46885119f90
test-copies: don't use empty file for "same content" cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46527
diff
changeset
|
1610 b76eb76580df486c3d51d63c5c210d4dd43a8ac7 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
|
1611 $ hg manifest --debug --rev 'desc("e-2")' | grep '644 f' |
46531
d46885119f90
test-copies: don't use empty file for "same content" cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46527
diff
changeset
|
1612 e8825b386367b29fec957283a80bb47b47483fe1 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
|
1613 $ 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
|
1614 rev linkrev nodeid p1 p2 |
46531
d46885119f90
test-copies: don't use empty file for "same content" cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46527
diff
changeset
|
1615 0 4 b76eb76580df 000000000000 000000000000 |
d46885119f90
test-copies: don't use empty file for "same content" cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46527
diff
changeset
|
1616 1 10 e8825b386367 000000000000 000000000000 |
d46885119f90
test-copies: don't use empty file for "same content" cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46527
diff
changeset
|
1617 2 19 2ff93c643948 b76eb76580df e8825b386367 |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
1618 #else |
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
1619 $ hg manifest --debug --rev 'desc("mAEm-0")' | grep '644 f' |
46531
d46885119f90
test-copies: don't use empty file for "same content" cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46527
diff
changeset
|
1620 ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
1621 $ hg manifest --debug --rev 'desc("mEAm-0")' | grep '644 f' |
46531
d46885119f90
test-copies: don't use empty file for "same content" cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46527
diff
changeset
|
1622 ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
1623 $ hg manifest --debug --rev 'desc("a-2")' | grep '644 f' |
46531
d46885119f90
test-copies: don't use empty file for "same content" cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46527
diff
changeset
|
1624 ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
1625 $ hg manifest --debug --rev 'desc("e-2")' | grep '644 f' |
46531
d46885119f90
test-copies: don't use empty file for "same content" cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46527
diff
changeset
|
1626 ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
1627 $ 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
|
1628 rev linkrev nodeid p1 p2 |
46531
d46885119f90
test-copies: don't use empty file for "same content" cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46527
diff
changeset
|
1629 0 4 ae258f702dfe 000000000000 000000000000 |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
1630 #endif |
44758
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
1631 |
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
1632 # 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
|
1633 # 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
|
1634 # 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
|
1635 |
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
|
1636 $ hg status --copies --rev 'desc("a-2")' --rev 'desc("mAEm-0")' |
46527
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
1637 M f (no-changeset !) |
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
1638 b (no-filelog 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
|
1639 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
|
1640 $ hg status --copies --rev 'desc("a-2")' --rev 'desc("mEAm-0")' |
46527
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
1641 M f (no-changeset !) |
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
1642 b (no-filelog 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
|
1643 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
|
1644 $ hg status --copies --rev 'desc("e-2")' --rev 'desc("mAEm-0")' |
46527
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
1645 M f (no-changeset !) |
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
1646 d (no-filelog 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
|
1647 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
|
1648 $ hg status --copies --rev 'desc("e-2")' --rev 'desc("mEAm-0")' |
46527
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
1649 M f (no-changeset !) |
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
1650 d (no-filelog 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
|
1651 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
|
1652 $ 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
|
1653 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
|
1654 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
|
1655 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
|
1656 $ 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
|
1657 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
|
1658 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
|
1659 R b |
44758
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
1660 |
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
1661 # 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
|
1662 # |
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
1663 # 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
|
1664 # 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
|
1665 # 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
|
1666 # 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
|
1667 # |
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
1668 # 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
|
1669 # 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
|
1670 # 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
|
1671 |
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
|
1672 $ 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
|
1673 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
|
1674 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
|
1675 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
|
1676 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
|
1677 $ 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
|
1678 A f |
44758
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
1679 d (filelog !) |
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
1680 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
|
1681 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
|
1682 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
|
1683 $ 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
|
1684 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
|
1685 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
|
1686 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
|
1687 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
|
1688 $ 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
|
1689 A f |
44758
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
1690 a (filelog !) |
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
1691 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
|
1692 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
|
1693 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
|
1694 |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1695 |
46543
f01696d45d1e
test-copies: add subcase titles for various "conflicting" information variant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46542
diff
changeset
|
1696 Subcase: existing copy information overwritten on one branch |
f01696d45d1e
test-copies: add subcase titles for various "conflicting" information variant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46542
diff
changeset
|
1697 ```````````````````````````````````````````````````````````` |
f01696d45d1e
test-copies: add subcase titles for various "conflicting" information variant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46542
diff
changeset
|
1698 |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1699 Note: |
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1700 | 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
|
1701 | 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
|
1702 |
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1703 |
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
|
1704 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
|
1705 - 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
|
1706 - 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
|
1707 |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1708 $ hg log -G --rev '::(desc("mBFm")+desc("mFBm"))' |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1709 o mFBm-0 simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - 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
|
1710 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1711 +---o mBFm-0 simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - one 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
|
1712 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1713 | o f-2: rename i -> d |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1714 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1715 | o f-1: rename h -> i |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1716 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1717 o | b-1: b update |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1718 |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1719 o i-2: c -move-> d |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1720 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1721 o i-1: a -move-> c |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1722 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1723 o i-0 initial commit: a b h |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1724 |
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
|
1725 $ 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
|
1726 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
|
1727 A d |
44687
1b8fd4af3318
mergestate: store about files resolved in favour of other
Pulkit Goyal <7895pulkit@gmail.com>
parents:
44678
diff
changeset
|
1728 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
|
1729 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
|
1730 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
|
1731 $ 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
|
1732 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
|
1733 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
|
1734 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
|
1735 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
|
1736 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
|
1737 $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBFm-0")' |
46527
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
1738 M d (no-changeset !) |
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
1739 h (no-filelog 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
|
1740 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
|
1741 $ 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
|
1742 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
|
1743 $ 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
|
1744 M b |
46527
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
1745 M d (no-changeset !) |
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
1746 i (no-filelog 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
|
1747 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
|
1748 $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mFBm-0")' |
46527
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
1749 M d (no-changeset !) |
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
1750 h (no-filelog 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
|
1751 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
|
1752 $ 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
|
1753 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
|
1754 $ 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
|
1755 M b |
46527
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
1756 M d (no-changeset !) |
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
1757 i (no-filelog 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
|
1758 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
|
1759 |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
1760 #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
|
1761 $ hg log -Gfr 'desc("mBFm-0")' d |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1762 o 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
|
1763 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1764 o f-1: rename h -> i |
44687
1b8fd4af3318
mergestate: store about files resolved in favour of other
Pulkit Goyal <7895pulkit@gmail.com>
parents:
44678
diff
changeset
|
1765 : |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1766 o 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
|
1767 |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
1768 #else |
45778
6620caf427ec
tests: add notes about broken `hg log --follow <file>` with copies in extras
Martin von Zweigbergk <martinvonz@google.com>
parents:
45765
diff
changeset
|
1769 BROKEN: `hg log --follow <file>` relies on filelog metadata to work |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
1770 $ hg log -Gfr 'desc("mBFm-0")' d |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1771 o i-2: c -move-> 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
|
1772 | |
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
1773 ~ |
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
1774 #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
|
1775 |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
1776 #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
|
1777 $ hg log -Gfr 'desc("mFBm-0")' d |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1778 o 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
|
1779 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1780 o 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
|
1781 : |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1782 o 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
|
1783 |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
1784 #else |
45778
6620caf427ec
tests: add notes about broken `hg log --follow <file>` with copies in extras
Martin von Zweigbergk <martinvonz@google.com>
parents:
45765
diff
changeset
|
1785 BROKEN: `hg log --follow <file>` relies on filelog metadata to work |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
1786 $ hg log -Gfr 'desc("mFBm-0")' d |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1787 o i-2: c -move-> 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
|
1788 | |
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
1789 ~ |
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
1790 #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
|
1791 |
46543
f01696d45d1e
test-copies: add subcase titles for various "conflicting" information variant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46542
diff
changeset
|
1792 Subcase: reset of the copy history on one side |
f01696d45d1e
test-copies: add subcase titles for various "conflicting" information variant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46542
diff
changeset
|
1793 `````````````````````````````````````````````` |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1794 |
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
|
1795 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
|
1796 - 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
|
1797 - 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
|
1798 |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1799 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
|
1800 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
|
1801 |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1802 $ hg log -G --rev '::(desc("mDGm")+desc("mGDm"))' |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1803 o mGDm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - 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
|
1804 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1805 +---o mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one 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
|
1806 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1807 | o g-1: update d |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1808 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1809 o | d-2 re-add d |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1810 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1811 o | d-1 delete d |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1812 |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1813 o i-2: c -move-> d |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1814 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1815 o i-1: a -move-> c |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1816 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1817 o i-0 initial commit: a b h |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1818 |
44758
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
1819 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
|
1820 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
|
1821 |
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
1822 (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
|
1823 revision numbers) |
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
1824 |
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
|
1825 $ 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
|
1826 A d |
44758
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
1827 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
|
1828 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
|
1829 $ 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
|
1830 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
|
1831 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
|
1832 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
|
1833 $ 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
|
1834 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
|
1835 $ 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
|
1836 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
|
1837 $ 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
|
1838 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
|
1839 $ 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
|
1840 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
|
1841 |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
1842 #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
|
1843 $ hg log -Gfr 'desc("mDGm-0")' d |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1844 o mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - 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
|
1845 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1846 | o 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
|
1847 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1848 o | 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
|
1849 |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1850 o 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
|
1851 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1852 o 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
|
1853 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1854 o 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
|
1855 |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
1856 #else |
45778
6620caf427ec
tests: add notes about broken `hg log --follow <file>` with copies in extras
Martin von Zweigbergk <martinvonz@google.com>
parents:
45765
diff
changeset
|
1857 BROKEN: `hg log --follow <file>` relies on filelog metadata to work |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
1858 $ hg log -Gfr 'desc("mDGm-0")' d |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1859 o mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one 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
|
1860 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1861 | o g-1: update 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
|
1862 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1863 o | d-2 re-add 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
|
1864 |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1865 o i-2: c -move-> 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
|
1866 | |
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
1867 ~ |
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
1868 #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
|
1869 |
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
|
1870 |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
1871 #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
|
1872 $ hg log -Gfr 'desc("mDGm-0")' d |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1873 o mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - 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
|
1874 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1875 | o 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
|
1876 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1877 o | 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
|
1878 |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1879 o 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
|
1880 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1881 o 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
|
1882 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1883 o 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
|
1884 |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
1885 #else |
45778
6620caf427ec
tests: add notes about broken `hg log --follow <file>` with copies in extras
Martin von Zweigbergk <martinvonz@google.com>
parents:
45765
diff
changeset
|
1886 BROKEN: `hg log --follow <file>` relies on filelog metadata to work |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
1887 $ hg log -Gfr 'desc("mDGm-0")' d |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1888 o mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one 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
|
1889 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1890 | o g-1: update 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
|
1891 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1892 o | d-2 re-add 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
|
1893 |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1894 o i-2: c -move-> 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
|
1895 | |
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
1896 ~ |
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
1897 #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
|
1898 |
46543
f01696d45d1e
test-copies: add subcase titles for various "conflicting" information variant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46542
diff
changeset
|
1899 Subcase: merging a change to a file with a "copy overwrite" to that file from another branch |
f01696d45d1e
test-copies: add subcase titles for various "conflicting" information variant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46542
diff
changeset
|
1900 ```````````````````````````````````````````````````````````````````````````````````````````` |
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
|
1901 |
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
|
1902 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
|
1903 - 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
|
1904 - 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
|
1905 |
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
|
1906 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
|
1907 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
|
1908 |
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
|
1909 |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1910 $ hg log -G --rev '::(desc("mGFm")+desc("mFGm"))' |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1911 o mGFm-0 merge - G side: content change, F side: copy overwrite, no content change - 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
|
1912 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1913 +---o mFGm-0 merge - G side: content change, F side: copy overwrite, no content change - one 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
|
1914 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1915 | o g-1: update d |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1916 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1917 o | f-2: rename i -> d |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1918 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1919 o | f-1: rename h -> i |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1920 |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1921 o i-2: c -move-> d |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1922 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1923 o i-1: a -move-> c |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1924 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1925 o i-0 initial commit: a b h |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
1926 |
46160
1d6aac94e6d5
copies: explain the "arbitrary" copy source pick in case of conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46159
diff
changeset
|
1927 |
1d6aac94e6d5
copies: explain the "arbitrary" copy source pick in case of conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46159
diff
changeset
|
1928 Note: |
1d6aac94e6d5
copies: explain the "arbitrary" copy source pick in case of conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46159
diff
changeset
|
1929 | In this case, the merge get conflicting information since on one side we have |
1d6aac94e6d5
copies: explain the "arbitrary" copy source pick in case of conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46159
diff
changeset
|
1930 | "a -> c -> d". and one the other one we have "h -> i -> d". |
1d6aac94e6d5
copies: explain the "arbitrary" copy source pick in case of conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46159
diff
changeset
|
1931 | |
1d6aac94e6d5
copies: explain the "arbitrary" copy source pick in case of conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46159
diff
changeset
|
1932 | The current code arbitrarily pick one side depending the ordering of the merged hash: |
1d6aac94e6d5
copies: explain the "arbitrary" copy source pick in case of conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46159
diff
changeset
|
1933 |
1d6aac94e6d5
copies: explain the "arbitrary" copy source pick in case of conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46159
diff
changeset
|
1934 In this case, the file hash from "f-2" is lower, so it will be `p1` of the resulting filenode its copy tracing information will win (and trace back to "h"): |
1d6aac94e6d5
copies: explain the "arbitrary" copy source pick in case of conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46159
diff
changeset
|
1935 |
1d6aac94e6d5
copies: explain the "arbitrary" copy source pick in case of conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46159
diff
changeset
|
1936 Details on this hash ordering pick: |
1d6aac94e6d5
copies: explain the "arbitrary" copy source pick in case of conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46159
diff
changeset
|
1937 |
1d6aac94e6d5
copies: explain the "arbitrary" copy source pick in case of conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46159
diff
changeset
|
1938 $ hg manifest --debug 'desc("g-1")' | egrep 'd$' |
46531
d46885119f90
test-copies: don't use empty file for "same content" cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46527
diff
changeset
|
1939 17ec97e605773eb44a117d1136b3849bcdc1924f 644 d (no-changeset !) |
d46885119f90
test-copies: don't use empty file for "same content" cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46527
diff
changeset
|
1940 5cce88bf349f7c742bb440f2c53f81db9c294279 644 d (changeset !) |
46160
1d6aac94e6d5
copies: explain the "arbitrary" copy source pick in case of conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46159
diff
changeset
|
1941 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("g-1")' d |
1d6aac94e6d5
copies: explain the "arbitrary" copy source pick in case of conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46159
diff
changeset
|
1942 A d |
1d6aac94e6d5
copies: explain the "arbitrary" copy source pick in case of conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46159
diff
changeset
|
1943 a (no-changeset no-compatibility !) |
1d6aac94e6d5
copies: explain the "arbitrary" copy source pick in case of conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46159
diff
changeset
|
1944 |
1d6aac94e6d5
copies: explain the "arbitrary" copy source pick in case of conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46159
diff
changeset
|
1945 $ hg manifest --debug 'desc("f-2")' | egrep 'd$' |
46531
d46885119f90
test-copies: don't use empty file for "same content" cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46527
diff
changeset
|
1946 7b79e2fe0c8924e0e598a82f048a7b024afa4d96 644 d (no-changeset !) |
d46885119f90
test-copies: don't use empty file for "same content" cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46527
diff
changeset
|
1947 ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 d (changeset !) |
46160
1d6aac94e6d5
copies: explain the "arbitrary" copy source pick in case of conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46159
diff
changeset
|
1948 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("f-2")' d |
1d6aac94e6d5
copies: explain the "arbitrary" copy source pick in case of conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46159
diff
changeset
|
1949 A d |
1d6aac94e6d5
copies: explain the "arbitrary" copy source pick in case of conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46159
diff
changeset
|
1950 h (no-changeset no-compatibility !) |
1d6aac94e6d5
copies: explain the "arbitrary" copy source pick in case of conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46159
diff
changeset
|
1951 |
1d6aac94e6d5
copies: explain the "arbitrary" copy source pick in case of conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46159
diff
changeset
|
1952 Copy tracing data on the resulting merge: |
1d6aac94e6d5
copies: explain the "arbitrary" copy source pick in case of conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46159
diff
changeset
|
1953 |
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
|
1954 $ 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
|
1955 A d |
46527
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
1956 h (no-filelog !) |
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
1957 a (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
|
1958 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
|
1959 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
|
1960 $ 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
|
1961 A d |
46527
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
1962 a (no-changeset !) |
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
1963 h (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
|
1964 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
|
1965 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
|
1966 $ 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
|
1967 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
|
1968 $ 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
|
1969 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
|
1970 $ 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
|
1971 M d |
44758
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
1972 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
|
1973 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
|
1974 $ 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
|
1975 M d |
44758
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
1976 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
|
1977 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
|
1978 $ hg status --copies --rev 'desc("g-1")' --rev 'desc("mFGm-0")' |
46527
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
1979 M d (no-changeset !) |
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
1980 h (no-filelog 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
|
1981 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
|
1982 $ hg status --copies --rev 'desc("g-1")' --rev 'desc("mGFm-0")' |
46527
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
1983 M d (no-changeset !) |
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
1984 h (no-filelog 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
|
1985 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
|
1986 |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
1987 #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
|
1988 $ hg log -Gfr 'desc("mFGm-0")' d |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1989 o mFGm-0 merge - G side: content change, F side: copy overwrite, no content change - 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
|
1990 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1991 | o 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
|
1992 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1993 o | 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
|
1994 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1995 o | 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
|
1996 |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1997 o 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
|
1998 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1999 o 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
|
2000 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2001 o 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
|
2002 |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2003 #else |
45778
6620caf427ec
tests: add notes about broken `hg log --follow <file>` with copies in extras
Martin von Zweigbergk <martinvonz@google.com>
parents:
45765
diff
changeset
|
2004 BROKEN: `hg log --follow <file>` relies on filelog metadata to work |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2005 $ hg log -Gfr 'desc("mFGm-0")' d |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2006 o g-1: update d |
46527
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
2007 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2008 o i-2: c -move-> 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
|
2009 | |
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2010 ~ |
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2011 #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
|
2012 |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2013 #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
|
2014 $ hg log -Gfr 'desc("mGFm-0")' d |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2015 o mGFm-0 merge - G side: content change, F side: copy overwrite, no content change - 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
|
2016 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2017 | o 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
|
2018 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2019 o | 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
|
2020 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2021 o | 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
|
2022 |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2023 o 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
|
2024 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2025 o 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
|
2026 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2027 o 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
|
2028 |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2029 #else |
45778
6620caf427ec
tests: add notes about broken `hg log --follow <file>` with copies in extras
Martin von Zweigbergk <martinvonz@google.com>
parents:
45765
diff
changeset
|
2030 BROKEN: `hg log --follow <file>` relies on filelog metadata to work |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2031 $ hg log -Gfr 'desc("mGFm-0")' d |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2032 o g-1: update d |
46527
018d622e814d
test-copies: reinstall initial identical (empty) files for chained copied
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46479
diff
changeset
|
2033 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2034 o i-2: c -move-> 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
|
2035 | |
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2036 ~ |
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2037 #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
|
2038 |
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
|
2039 |
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
|
2040 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
|
2041 ------------------------------------------------------------- |
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
|
2042 |
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
|
2043 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
|
2044 - 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
|
2045 - 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
|
2046 - 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
|
2047 |
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
|
2048 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
|
2049 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
|
2050 |
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
|
2051 $ hg log -G --rev '::(desc("mCGm")+desc("mGCm"))' |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2052 o mGCm-0 merge updated/deleted - revive the file (updated content) - the other way |
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
|
2053 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2054 +---o mCGm-0 merge updated/deleted - revive the file (updated content) - one way |
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
|
2055 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2056 | o g-1: update 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
|
2057 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2058 o | c-1 delete 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
|
2059 |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2060 o i-2: c -move-> 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
|
2061 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2062 o i-1: a -move-> c |
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
|
2063 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2064 o i-0 initial commit: a b h |
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
|
2065 |
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
|
2066 |
45670
a8fb29b05f92
salvaged: properly deal with salvaged file during copy tracing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45669
diff
changeset
|
2067 '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
|
2068 |
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
|
2069 $ 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
|
2070 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
|
2071 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
|
2072 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
|
2073 $ 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
|
2074 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
|
2075 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
|
2076 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
|
2077 $ 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
|
2078 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
|
2079 $ 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
|
2080 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
|
2081 $ 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
|
2082 $ 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
|
2083 |
14be07d5603c
copy-tracing: test case where a merge reverted a file deletion
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45460
diff
changeset
|
2084 |
14be07d5603c
copy-tracing: test case where a merge reverted a file deletion
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45460
diff
changeset
|
2085 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
|
2086 -------------------------------------------------------- |
14be07d5603c
copy-tracing: test case where a merge reverted a file deletion
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45460
diff
changeset
|
2087 |
14be07d5603c
copy-tracing: test case where a merge reverted a file deletion
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45460
diff
changeset
|
2088 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
|
2089 - 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
|
2090 - 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
|
2091 - 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
|
2092 |
14be07d5603c
copy-tracing: test case where a merge reverted a file deletion
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45460
diff
changeset
|
2093 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
|
2094 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
|
2095 |
14be07d5603c
copy-tracing: test case where a merge reverted a file deletion
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45460
diff
changeset
|
2096 $ hg log -G --rev '::(desc("mCB-revert-m")+desc("mBC-revert-m"))' |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2097 o mBC-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - the other way |
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
|
2098 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2099 +---o mCB-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - one way |
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
|
2100 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2101 | o c-1 delete 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
|
2102 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2103 o | b-1: b update |
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
|
2104 |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2105 o i-2: c -move-> 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
|
2106 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2107 o i-1: a -move-> c |
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
|
2108 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2109 o i-0 initial commit: a b h |
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
|
2110 |
14be07d5603c
copy-tracing: test case where a merge reverted a file deletion
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45460
diff
changeset
|
2111 |
45670
a8fb29b05f92
salvaged: properly deal with salvaged file during copy tracing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45669
diff
changeset
|
2112 '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
|
2113 |
14be07d5603c
copy-tracing: test case where a merge reverted a file deletion
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45460
diff
changeset
|
2114 $ 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
|
2115 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
|
2116 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
|
2117 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
|
2118 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
|
2119 $ 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
|
2120 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
|
2121 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
|
2122 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
|
2123 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
|
2124 $ 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
|
2125 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
|
2126 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
|
2127 $ 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
|
2128 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
|
2129 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
|
2130 $ 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
|
2131 $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBC-revert-m-0")' |
45798
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2132 |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2133 |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2134 Merging a branch where a rename was deleted with a branch where the same file was renamed |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2135 ------------------------------------------------------------------------------------------ |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2136 |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2137 Create a "conflicting" merge where `d` get removed on one branch before its |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2138 rename information actually conflict with the other branch. |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2139 |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2140 (the copy information from the branch that was not deleted should win). |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2141 |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2142 $ hg log -G --rev '::(desc("mCH-delete-before-conflict-m")+desc("mHC-delete-before-conflict-m"))' |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2143 o mHC-delete-before-conflict-m-0 simple merge - C side: d is the results of renames then deleted, H side: d is result of another rename (same content as the other branch) - the other way |
45798
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2144 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2145 +---o mCH-delete-before-conflict-m-0 simple merge - C side: d is the results of renames then deleted, H side: d is result of another rename (same content as the other branch) - one way |
45798
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2146 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2147 | o h-1: b -(move)-> d |
45798
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2148 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2149 o | c-1 delete d |
45798
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2150 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2151 o | i-2: c -move-> d |
45798
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2152 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2153 o | i-1: a -move-> c |
45798
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2154 |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2155 o i-0 initial commit: a b h |
45798
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2156 |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2157 |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2158 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCH-delete-before-conflict-m")' |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2159 A d |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2160 b (no-compatibility no-changeset !) |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2161 R a |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2162 R b |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2163 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mHC-delete-before-conflict-m")' |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2164 A d |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2165 b |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2166 R a |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2167 R b |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2168 $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mCH-delete-before-conflict-m")' |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2169 A d |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2170 b |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2171 R b |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2172 $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mHC-delete-before-conflict-m")' |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2173 A d |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2174 b |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2175 R b |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2176 $ hg status --copies --rev 'desc("h-1")' --rev 'desc("mCH-delete-before-conflict-m")' |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2177 R a |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2178 $ hg status --copies --rev 'desc("h-1")' --rev 'desc("mHC-delete-before-conflict-m")' |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
2179 R a |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2180 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2181 Decision from previous merge are properly chained with later merge |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2182 ------------------------------------------------------------------ |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2183 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2184 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2185 Subcase: chaining conflicting rename resolution |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2186 ``````````````````````````````````````````````` |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2187 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2188 The "mAEm" and "mEAm" case create a rename tracking conflict on file 'f'. We |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2189 add more change on the respective branch and merge again. These second merge |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2190 does not involve the file 'f' and the arbitration done within "mAEm" and "mEA" |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2191 about that file should stay unchanged. |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2192 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2193 The result from mAEm is the same for the subsequent merge: |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2194 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2195 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mAEm")' f |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2196 A f |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2197 a (filelog !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2198 a (sidedata !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2199 a (upgraded !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2200 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2201 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mAE,Km")' f |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2202 A f |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2203 a (filelog !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2204 a (sidedata !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2205 a (upgraded !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2206 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2207 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mK,AEm")' f |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2208 A f |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2209 a (filelog !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2210 a (missing-correct-output sidedata !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2211 a (missing-correct-output upgraded !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2212 b (known-bad-output sidedata !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2213 b (known-bad-output upgraded !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2214 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2215 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2216 The result from mEAm is the same for the subsequent merge: |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2217 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2218 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mEAm")' f |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2219 A f |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2220 a (filelog !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2221 b (sidedata !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2222 b (upgraded !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2223 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2224 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mEA,Jm")' f |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2225 A f |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2226 a (filelog !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2227 b (sidedata !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2228 b (upgraded !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2229 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2230 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mJ,EAm")' f |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2231 A f |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2232 a (filelog !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2233 b (missing-correct-output sidedata !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2234 b (missing-correct-output upgraded !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2235 a (known-bad-output sidedata !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2236 a (known-bad-output upgraded !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2237 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
2238 |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2239 Subcase: chaining salvage information during a merge |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2240 ```````````````````````````````````````````````````` |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2241 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2242 We add more change on the branch were the file was deleted. merging again |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2243 should preserve the fact eh file was salvaged. |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2244 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2245 reference output: |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2246 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2247 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCB-revert-m-0")' |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2248 M b |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2249 A d |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2250 a (filelog !) |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2251 a (sidedata !) |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2252 a (upgraded !) |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2253 R a |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2254 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBC-revert-m-0")' |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2255 M b |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2256 A d |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2257 a (filelog !) |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2258 a (sidedata !) |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2259 a (upgraded !) |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2260 R a |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2261 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2262 chained output |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2263 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2264 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBC+revert,Lm")' |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2265 M b |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2266 A d |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2267 a (filelog !) |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2268 a (missing-correct-output sidedata !) |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2269 a (missing-correct-output upgraded !) |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2270 A unrelated-l |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2271 R a |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2272 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCB+revert,Lm")' |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2273 M b |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2274 A d |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2275 a (filelog !) |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2276 a (missing-correct-output sidedata !) |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2277 a (missing-correct-output upgraded !) |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2278 A unrelated-l |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2279 R a |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2280 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mL,BC+revertm")' |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2281 M b |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2282 A d |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2283 a (filelog !) |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2284 a (missing-correct-output sidedata !) |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2285 a (missing-correct-output upgraded !) |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2286 A unrelated-l |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2287 R a |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2288 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mL,CB+revertm")' |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2289 M b |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2290 A d |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2291 a (filelog !) |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2292 a (missing-correct-output sidedata !) |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2293 a (missing-correct-output upgraded !) |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2294 A unrelated-l |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2295 R a |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2296 |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2297 Subcase: chaining "merged" information during a merge |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2298 `````````````````````````````````````````````````````` |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2299 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2300 When a non-rename change are merged with a copy overwrite, the merge pick the copy source from (p1) as the reference. We should preserve this information in subsequent merges. |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2301 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2302 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2303 reference output: |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2304 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2305 (for details about the filelog pick, check the mFGm/mGFm case) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2306 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2307 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mFGm")' d |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2308 A d |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2309 a (filelog !) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2310 h (sidedata !) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2311 h (upgraded !) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2312 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mGFm")' d |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2313 A d |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2314 a (filelog !) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2315 a (sidedata !) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2316 a (upgraded !) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2317 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2318 Chained output |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2319 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2320 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mO,FGm")' d |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2321 A d |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2322 a (filelog !) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2323 h (sidedata !) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2324 h (upgraded !) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2325 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mFG,Om")' d |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2326 A d |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2327 a (filelog !) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2328 h (sidedata !) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2329 h (upgraded !) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2330 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2331 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2332 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mGF,Nm")' d |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2333 A d |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2334 a (filelog !) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2335 a (missing-correct-output sidedata !) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2336 a (missing-correct-output upgraded !) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2337 h (known-bad-output sidedata !) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2338 h (known-bad-output upgraded !) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2339 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mN,GFm")' d |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2340 A d |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2341 a (filelog !) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2342 a (missing-correct-output sidedata !) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2343 a (missing-correct-output upgraded !) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2344 h (known-bad-output sidedata !) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2345 h (known-bad-output upgraded !) |