Mercurial > hg
annotate tests/test-copies-chain-merge.t @ 46812:e4696ba43ecd
test-copies: show some wrong ChangedFiles upgrade
For file present only on one side and touched during merge, the upgrade code
confused them as "merged". However they should be either "touched", or
"salvaged" but they are currently recorded as "merged". See the next changesets
for more details on these cases and fix.
Differential Revision: https://phab.mercurial-scm.org/D10218
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Sat, 13 Mar 2021 04:54:05 +0100 |
parents | 5a0b930cfb3e |
children | 316a768f2e43 |
rev | line source |
---|---|
46618
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
1 #testcases filelog compatibility changeset sidedata upgraded upgraded-parallel |
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 |
46552
9cd4f58467af
test-copies: filter out the linkrev part of `debugindex`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46551
diff
changeset
|
17 $ cat << EOF >> ./no-linkrev |
9cd4f58467af
test-copies: filter out the linkrev part of `debugindex`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46551
diff
changeset
|
18 > #!$PYTHON |
9cd4f58467af
test-copies: filter out the linkrev part of `debugindex`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46551
diff
changeset
|
19 > # filter out linkrev part of the debugindex command |
9cd4f58467af
test-copies: filter out the linkrev part of `debugindex`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46551
diff
changeset
|
20 > import sys |
9cd4f58467af
test-copies: filter out the linkrev part of `debugindex`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46551
diff
changeset
|
21 > for line in sys.stdin: |
9cd4f58467af
test-copies: filter out the linkrev part of `debugindex`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46551
diff
changeset
|
22 > if " linkrev " in line: |
9cd4f58467af
test-copies: filter out the linkrev part of `debugindex`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46551
diff
changeset
|
23 > print(line.rstrip()) |
9cd4f58467af
test-copies: filter out the linkrev part of `debugindex`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46551
diff
changeset
|
24 > else: |
9cd4f58467af
test-copies: filter out the linkrev part of `debugindex`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46551
diff
changeset
|
25 > l = "%s *%s" % (line[:6], line[14:].rstrip()) |
9cd4f58467af
test-copies: filter out the linkrev part of `debugindex`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46551
diff
changeset
|
26 > print(l) |
9cd4f58467af
test-copies: filter out the linkrev part of `debugindex`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46551
diff
changeset
|
27 > EOF |
9cd4f58467af
test-copies: filter out the linkrev part of `debugindex`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46551
diff
changeset
|
28 $ chmod +x no-linkrev |
9cd4f58467af
test-copies: filter out the linkrev part of `debugindex`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46551
diff
changeset
|
29 |
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
|
30 $ 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
|
31 > [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
|
32 > 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
|
33 > [command-templates] |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
34 > 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
|
35 > 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
|
36 |
44758
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
37 #if compatibility |
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
38 $ cat >> $HGRCPATH << EOF |
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
39 > [experimental] |
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
40 > 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
|
41 > EOF |
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
42 #endif |
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
43 |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
44 #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
|
45 $ 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
|
46 > [experimental] |
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
47 > 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
|
48 > 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
|
49 > EOF |
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
50 #endif |
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
51 |
44758
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
52 #if sidedata |
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
53 $ cat >> $HGRCPATH << EOF |
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
54 > [format] |
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
55 > 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
|
56 > 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
|
57 > EOF |
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
58 #endif |
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
59 |
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
60 |
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
|
61 $ 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
|
62 > 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
|
63 > |
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 > 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
|
65 > 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
|
66 > 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
|
67 > 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
|
68 > 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
|
69 |
44281
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
70 $ 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
|
71 $ 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
|
72 |
f9dfb56ed6e8
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 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
|
74 |
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
|
75 $ 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
|
76 $ 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
|
77 $ cp ../same-content.txt h |
46555
46205a478a08
test-copies: add 3 new files with their own content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46554
diff
changeset
|
78 $ echo "original content for P" > p |
46205a478a08
test-copies: add 3 new files with their own content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46554
diff
changeset
|
79 $ echo "original content for Q" > q |
46205a478a08
test-copies: add 3 new files with their own content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46554
diff
changeset
|
80 $ echo "original content for R" > r |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
81 $ hg ci -Am 'i-0 initial commit: a b h p q r' |
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 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
|
83 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
|
84 adding h |
46555
46205a478a08
test-copies: add 3 new files with their own content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46554
diff
changeset
|
85 adding p |
46205a478a08
test-copies: add 3 new files with their own content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46554
diff
changeset
|
86 adding q |
46205a478a08
test-copies: add 3 new files with their own content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46554
diff
changeset
|
87 adding r |
44281
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
88 $ hg mv a c |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
89 $ hg mv p s |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
90 $ hg ci -Am 'i-1: a -move-> c, p -move-> s' |
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 $ hg mv c d |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
92 $ hg mv s t |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
93 $ hg ci -Am 'i-2: c -move-> d, s -move-> t' |
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
|
94 $ hg log -G |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
95 @ i-2: c -move-> d, s -move-> t |
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
|
96 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
97 o i-1: a -move-> c, p -move-> s |
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
|
98 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
99 o i-0 initial commit: a b h p q r |
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 |
44453
68e14fecd82a
copies-tests: swap two branch description
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44444
diff
changeset
|
102 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
|
103 |
f9dfb56ed6e8
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 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
|
105 $ 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
|
106 $ 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
|
107 $ 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
|
108 $ 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
|
109 @ 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
|
110 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
111 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
|
112 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
113 o i-2: c -move-> d, s -move-> t |
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 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
115 o i-1: a -move-> c, p -move-> s |
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
|
116 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
117 o i-0 initial commit: a b h p q r |
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
|
118 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
119 |
44453
68e14fecd82a
copies-tests: swap two branch description
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44444
diff
changeset
|
120 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
|
121 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
122 $ 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
|
123 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
|
124 $ 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
|
125 $ 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
|
126 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
|
127 $ 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
|
128 @ 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
|
129 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
130 o i-2: c -move-> d, s -move-> t |
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
|
131 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
132 o i-1: a -move-> c, p -move-> s |
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
|
133 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
134 o i-0 initial commit: a b h p q r |
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
|
135 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
136 |
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
|
137 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
|
138 |
4e2845d9452d
tests: collect all branch creation in one place in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44662
diff
changeset
|
139 $ 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
|
140 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
|
141 $ 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
|
142 $ 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
|
143 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
|
144 $ 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
|
145 @ 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
|
146 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
147 o i-2: c -move-> d, s -move-> t |
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
|
148 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
149 o i-1: a -move-> c, p -move-> s |
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
|
150 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
151 o i-0 initial commit: a b h p q r |
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
|
152 |
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 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
|
155 |
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 $ 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
|
157 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
|
158 $ 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
|
159 $ 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
|
160 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
|
161 $ 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
|
162 $ 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
|
163 $ 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
|
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 @ 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
|
166 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
167 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
|
168 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
169 o i-2: c -move-> d, s -move-> t |
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 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
171 o i-1: a -move-> c, p -move-> s |
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 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
173 o i-0 initial commit: a b h p q r |
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 |
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
|
175 |
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
|
176 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
|
177 |
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
|
178 $ 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
|
179 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
|
180 $ 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
|
181 $ 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
|
182 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
|
183 $ 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
|
184 $ 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
|
185 $ 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
|
186 @ 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
|
187 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
188 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
|
189 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
190 o i-2: c -move-> d, s -move-> t |
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 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
192 o i-1: a -move-> c, p -move-> s |
44677
4e2845d9452d
tests: collect all branch creation in one place in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44662
diff
changeset
|
193 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
194 o i-0 initial commit: a b h p q r |
44677
4e2845d9452d
tests: collect all branch creation in one place in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44662
diff
changeset
|
195 |
46557
067307d6589d
test-copies: add a `p` branch similar to the `a` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46556
diff
changeset
|
196 $ hg up -q null |
067307d6589d
test-copies: add a `p` branch similar to the `a` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46556
diff
changeset
|
197 |
067307d6589d
test-copies: add a `p` branch similar to the `a` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46556
diff
changeset
|
198 Having a branch similar to the 'a' one, but moving the 'p' file around. |
067307d6589d
test-copies: add a `p` branch similar to the `a` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46556
diff
changeset
|
199 |
067307d6589d
test-copies: add a `p` branch similar to the `a` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46556
diff
changeset
|
200 $ hg up 'desc("i-2")' |
067307d6589d
test-copies: add a `p` branch similar to the `a` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46556
diff
changeset
|
201 6 files updated, 0 files merged, 0 files removed, 0 files unresolved |
067307d6589d
test-copies: add a `p` branch similar to the `a` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46556
diff
changeset
|
202 $ hg mv t u |
067307d6589d
test-copies: add a `p` branch similar to the `a` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46556
diff
changeset
|
203 $ hg ci -Am 'p-1: t -move-> u' |
067307d6589d
test-copies: add a `p` branch similar to the `a` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46556
diff
changeset
|
204 created new head |
067307d6589d
test-copies: add a `p` branch similar to the `a` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46556
diff
changeset
|
205 $ hg mv u v |
067307d6589d
test-copies: add a `p` branch similar to the `a` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46556
diff
changeset
|
206 $ hg ci -Am 'p-2: u -move-> v' |
067307d6589d
test-copies: add a `p` branch similar to the `a` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46556
diff
changeset
|
207 $ hg log -G --rev '::.' |
067307d6589d
test-copies: add a `p` branch similar to the `a` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46556
diff
changeset
|
208 @ p-2: u -move-> v |
067307d6589d
test-copies: add a `p` branch similar to the `a` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46556
diff
changeset
|
209 | |
067307d6589d
test-copies: add a `p` branch similar to the `a` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46556
diff
changeset
|
210 o p-1: t -move-> u |
067307d6589d
test-copies: add a `p` branch similar to the `a` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46556
diff
changeset
|
211 | |
067307d6589d
test-copies: add a `p` branch similar to the `a` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46556
diff
changeset
|
212 o i-2: c -move-> d, s -move-> t |
067307d6589d
test-copies: add a `p` branch similar to the `a` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46556
diff
changeset
|
213 | |
067307d6589d
test-copies: add a `p` branch similar to the `a` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46556
diff
changeset
|
214 o i-1: a -move-> c, p -move-> s |
067307d6589d
test-copies: add a `p` branch similar to the `a` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46556
diff
changeset
|
215 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
216 o i-0 initial commit: a b h p q r |
46557
067307d6589d
test-copies: add a `p` branch similar to the `a` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46556
diff
changeset
|
217 |
067307d6589d
test-copies: add a `p` branch similar to the `a` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46556
diff
changeset
|
218 $ hg up -q null |
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 |
46558
eb60dadd1be1
test-copies: add a `q` branch similar to the `e` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46557
diff
changeset
|
220 Having another branch renaming a different file to the same filename as another |
eb60dadd1be1
test-copies: add a `q` branch similar to the `e` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46557
diff
changeset
|
221 |
eb60dadd1be1
test-copies: add a `q` branch similar to the `e` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46557
diff
changeset
|
222 $ hg up 'desc("i-2")' |
eb60dadd1be1
test-copies: add a `q` branch similar to the `e` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46557
diff
changeset
|
223 6 files updated, 0 files merged, 0 files removed, 0 files unresolved |
eb60dadd1be1
test-copies: add a `q` branch similar to the `e` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46557
diff
changeset
|
224 $ hg mv r w |
eb60dadd1be1
test-copies: add a `q` branch similar to the `e` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46557
diff
changeset
|
225 $ hg ci -m 'q-1 r -move-> w' |
eb60dadd1be1
test-copies: add a `q` branch similar to the `e` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46557
diff
changeset
|
226 created new head |
eb60dadd1be1
test-copies: add a `q` branch similar to the `e` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46557
diff
changeset
|
227 $ hg mv w v |
eb60dadd1be1
test-copies: add a `q` branch similar to the `e` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46557
diff
changeset
|
228 $ hg ci -m 'q-2 w -move-> v' |
eb60dadd1be1
test-copies: add a `q` branch similar to the `e` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46557
diff
changeset
|
229 $ hg log -G --rev '::.' |
eb60dadd1be1
test-copies: add a `q` branch similar to the `e` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46557
diff
changeset
|
230 @ q-2 w -move-> v |
eb60dadd1be1
test-copies: add a `q` branch similar to the `e` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46557
diff
changeset
|
231 | |
eb60dadd1be1
test-copies: add a `q` branch similar to the `e` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46557
diff
changeset
|
232 o q-1 r -move-> w |
eb60dadd1be1
test-copies: add a `q` branch similar to the `e` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46557
diff
changeset
|
233 | |
eb60dadd1be1
test-copies: add a `q` branch similar to the `e` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46557
diff
changeset
|
234 o i-2: c -move-> d, s -move-> t |
eb60dadd1be1
test-copies: add a `q` branch similar to the `e` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46557
diff
changeset
|
235 | |
eb60dadd1be1
test-copies: add a `q` branch similar to the `e` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46557
diff
changeset
|
236 o i-1: a -move-> c, p -move-> s |
eb60dadd1be1
test-copies: add a `q` branch similar to the `e` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46557
diff
changeset
|
237 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
238 o i-0 initial commit: a b h p q r |
46558
eb60dadd1be1
test-copies: add a `q` branch similar to the `e` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46557
diff
changeset
|
239 |
eb60dadd1be1
test-copies: add a `q` branch similar to the `e` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46557
diff
changeset
|
240 $ hg up -q null |
eb60dadd1be1
test-copies: add a `q` branch similar to the `e` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46557
diff
changeset
|
241 |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
242 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
|
243 =============== |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
244 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
245 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
|
246 information. |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
247 |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
248 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
|
249 --------------------------------------------------------------- |
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
250 |
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
251 - 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
|
252 - 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
|
253 |
46533
e20977208924
test-copies: improve description of the A+B case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46532
diff
changeset
|
254 $ 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
|
255 |
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
|
256 $ hg up 'desc("b-1")' |
46557
067307d6589d
test-copies: add a `p` branch similar to the `a` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46556
diff
changeset
|
257 6 files updated, 0 files merged, 0 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
|
258 $ 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
|
259 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
|
260 (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
|
261 $ 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
|
262 $ 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
|
263 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
|
264 $ 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
|
265 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
|
266 (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
|
267 $ 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
|
268 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
|
269 $ 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
|
270 @ 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
|
271 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
272 +---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
|
273 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
274 | 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
|
275 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
276 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
|
277 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
278 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
|
279 |/ |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
280 o i-2: c -move-> d, s -move-> t |
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
|
281 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
282 o i-1: a -move-> c, p -move-> s |
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
|
283 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
284 o i-0 initial commit: a b h p q r |
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
|
285 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
286 |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
287 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
288 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
|
289 ------------------------------------- |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
290 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
291 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
|
292 - 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
|
293 - 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
|
294 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
|
295 |
46534
979838adc46b
test-copies: improve description of the B+C case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46533
diff
changeset
|
296 $ 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
|
297 |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
298 $ 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
|
299 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
|
300 $ 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
|
301 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
|
302 (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
|
303 $ 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
|
304 $ 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
|
305 $ 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
|
306 $ 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
|
307 $ 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
|
308 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
|
309 $ 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
|
310 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
|
311 (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
|
312 $ 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
|
313 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
|
314 $ 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
|
315 $ 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
|
316 $ 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
|
317 $ 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
|
318 @ 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
|
319 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
320 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
|
321 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
322 | | 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
|
323 | | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
324 +---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
|
325 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
326 | 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
|
327 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
328 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
|
329 |/ |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
330 o i-2: c -move-> d, s -move-> t |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
331 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
332 o i-1: a -move-> c, p -move-> s |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
333 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
334 o i-0 initial commit: a b h p q r |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
335 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
336 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
337 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
|
338 --------------------------------------------------- |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
339 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
340 Merge: |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
341 - one 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
|
342 - 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
|
343 |
46535
9a58f9eed303
test-copies: improve description of the B+D case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46534
diff
changeset
|
344 $ 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
|
345 |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
346 $ hg 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
|
347 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
|
348 $ 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
|
349 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
|
350 (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
|
351 $ 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
|
352 $ 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
|
353 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
|
354 $ 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
|
355 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
|
356 (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
|
357 $ 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
|
358 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
|
359 $ 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
|
360 @ 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
|
361 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
362 +---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
|
363 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
364 | 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
|
365 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
366 | 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
|
367 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
368 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
|
369 |/ |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
370 o i-2: c -move-> d, s -move-> t |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
371 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
372 o i-1: a -move-> c, p -move-> s |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
373 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
374 o i-0 initial commit: a b h p q r |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
375 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
376 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
377 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
378 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
|
379 -------------------------------------------- |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
380 |
46543
f01696d45d1e
test-copies: add subcase titles for various "conflicting" information variant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46542
diff
changeset
|
381 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
|
382 `````````````````````````````````````````` |
f01696d45d1e
test-copies: add subcase titles for various "conflicting" information variant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46542
diff
changeset
|
383 |
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 - 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
|
385 - 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
|
386 |
46536
19f490690880
test-copies: improve description of the A+E case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46535
diff
changeset
|
387 $ 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
|
388 |
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("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
|
390 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
|
391 $ 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
|
392 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
|
393 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
|
394 (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
|
395 $ 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
|
396 $ 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
|
397 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
|
398 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
|
399 $ 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
|
400 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
|
401 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
|
402 (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
|
403 $ 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
|
404 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
|
405 $ 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
|
406 @ 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
|
407 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
408 +---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
|
409 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
410 | 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
|
411 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
412 | 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
|
413 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
414 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
|
415 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
416 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
|
417 |/ |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
418 o i-2: c -move-> d, s -move-> t |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
419 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
420 o i-1: a -move-> c, p -move-> s |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
421 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
422 o i-0 initial commit: a b h p q r |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
423 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
424 |
46559
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
425 Subcase: new copy information on both side with an actual merge happening |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
426 ````````````````````````````````````````````````````````````````````````` |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
427 |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
428 - the "p-" branch renaming 't' to 'v' (through 'u') |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
429 - the "q-" branch renaming 'r' to 'v' (through 'w') |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
430 |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
431 $ case_desc="merge with copies info on both side - P side: rename t to v, Q side: r to v, (different content)" |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
432 |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
433 $ hg up 'desc("p-2")' |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
434 3 files updated, 0 files merged, 2 files removed, 0 files unresolved |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
435 $ hg merge 'desc("q-2")' --tool ':union' |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
436 merging v |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
437 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
438 (branch merge, don't forget to commit) |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
439 $ hg ci -m "mPQm-0 $case_desc - one way" |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
440 $ hg up 'desc("q-2")' |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
441 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
442 $ hg merge 'desc("p-2")' --tool ':union' |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
443 merging v |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
444 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
445 (branch merge, don't forget to commit) |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
446 $ hg ci -m "mQPm-0 $case_desc - the other way" |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
447 created new head |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
448 $ hg log -G --rev '::(desc("mAEm")+desc("mEAm"))' |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
449 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 |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
450 |\ |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
451 +---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 |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
452 | |/ |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
453 | o e-2 g -move-> f |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
454 | | |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
455 | o e-1 b -move-> g |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
456 | | |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
457 o | a-2: e -move-> f |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
458 | | |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
459 o | a-1: d -move-> e |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
460 |/ |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
461 o i-2: c -move-> d, s -move-> t |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
462 | |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
463 o i-1: a -move-> c, p -move-> s |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
464 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
465 o i-0 initial commit: a b h p q r |
46559
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
466 |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
467 |
46543
f01696d45d1e
test-copies: add subcase titles for various "conflicting" information variant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46542
diff
changeset
|
468 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
|
469 ```````````````````````````````````````````````````````````` |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
470 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
471 Merge: |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
472 - 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
|
473 - 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
|
474 |
46542
f8888f5c8c50
test-copies: improve description of the B+F case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46541
diff
changeset
|
475 $ 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
|
476 |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
477 $ 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
|
478 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
|
479 $ 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
|
480 $ 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
|
481 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
|
482 $ 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
|
483 $ hg commit -m "f-2: rename i -> d" |
46552
9cd4f58467af
test-copies: filter out the linkrev part of `debugindex`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46551
diff
changeset
|
484 $ hg debugindex d | ../no-linkrev |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
485 rev linkrev nodeid p1 p2 |
46552
9cd4f58467af
test-copies: filter out the linkrev part of `debugindex`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46551
diff
changeset
|
486 0 * d8252ab2e760 000000000000 000000000000 (no-changeset !) |
9cd4f58467af
test-copies: filter out the linkrev part of `debugindex`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46551
diff
changeset
|
487 0 * ae258f702dfe 000000000000 000000000000 (changeset !) |
9cd4f58467af
test-copies: filter out the linkrev part of `debugindex`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46551
diff
changeset
|
488 1 * b004912a8510 000000000000 000000000000 |
9cd4f58467af
test-copies: filter out the linkrev part of `debugindex`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46551
diff
changeset
|
489 2 * 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
|
490 $ 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
|
491 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
|
492 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
|
493 $ 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
|
494 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
|
495 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
|
496 (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
|
497 $ 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
|
498 $ 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
|
499 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
|
500 $ 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
|
501 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
|
502 (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
|
503 $ 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
|
504 created new head |
46559
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
505 $ hg up null --quiet |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
506 $ hg log -G --rev '::(desc("mBFm")+desc("mFBm"))' |
46559
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
507 o 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
|
508 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
509 +---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
|
510 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
511 | 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
|
512 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
513 | 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
|
514 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
515 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
|
516 |/ |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
517 o i-2: c -move-> d, s -move-> t |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
518 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
519 o i-1: a -move-> c, p -move-> s |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
520 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
521 o i-0 initial commit: a b h p q r |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
522 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
523 |
46560
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
524 Subcase: existing copy information overwritten on one branch, with different content) |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
525 ````````````````````````````````````````````````````````````````````````````````````` |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
526 |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
527 Merge: |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
528 - one with change to an unrelated file (b) |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
529 - one overwriting a file (t) with a rename (from r to x to t), v content is not the same as on the other branch |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
530 |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
531 $ case_desc="simple merge - B side: unrelated change, R side: overwrite d with a copy (from r->x->t) different content" |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
532 |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
533 $ hg up 'desc("i-2")' |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
534 6 files updated, 0 files merged, 0 files removed, 0 files unresolved |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
535 $ hg mv r x |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
536 $ hg commit -m "r-1: rename r -> x" |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
537 created new head |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
538 $ hg mv --force x t |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
539 $ hg commit -m "r-2: rename t -> x" |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
540 $ hg debugindex t | ../no-linkrev |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
541 rev linkrev nodeid p1 p2 |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
542 0 * d74efbf65309 000000000000 000000000000 (no-changeset !) |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
543 1 * 02a930b9d7ad 000000000000 000000000000 (no-changeset !) |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
544 0 * 5aed6a8dbff0 000000000000 000000000000 (changeset !) |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
545 1 * a38b2fa17021 000000000000 000000000000 (changeset !) |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
546 $ hg up 'desc("b-1")' |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
547 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
548 $ hg merge 'desc("r-2")' |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
549 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
550 (branch merge, don't forget to commit) |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
551 $ hg ci -m "mBRm-0 $case_desc - one way" |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
552 $ hg up 'desc("r-2")' |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
553 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
554 $ hg merge 'desc("b-1")' |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
555 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
556 (branch merge, don't forget to commit) |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
557 $ hg ci -m "mRBm-0 $case_desc - the other way" |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
558 created new head |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
559 $ hg up null --quiet |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
560 $ hg log -G --rev '::(desc("mBRm")+desc("mRBm"))' |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
561 o mRBm-0 simple merge - B side: unrelated change, R side: overwrite d with a copy (from r->x->t) different content - the other way |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
562 |\ |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
563 +---o mBRm-0 simple merge - B side: unrelated change, R side: overwrite d with a copy (from r->x->t) different content - one way |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
564 | |/ |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
565 | o r-2: rename t -> x |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
566 | | |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
567 | o r-1: rename r -> x |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
568 | | |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
569 o | b-1: b update |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
570 |/ |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
571 o i-2: c -move-> d, s -move-> t |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
572 | |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
573 o i-1: a -move-> c, p -move-> s |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
574 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
575 o i-0 initial commit: a b h p q r |
46560
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
576 |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
577 |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
578 |
46543
f01696d45d1e
test-copies: add subcase titles for various "conflicting" information variant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46542
diff
changeset
|
579 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
|
580 `````````````````````````````````````````````` |
f01696d45d1e
test-copies: add subcase titles for various "conflicting" information variant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46542
diff
changeset
|
581 |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
582 Merge: |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
583 - 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
|
584 - 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
|
585 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
586 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
|
587 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
|
588 |
46537
1e96fdcc8bc1
test-copies: improve description of the D+G case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46536
diff
changeset
|
589 $ 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
|
590 |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
591 $ hg up 'desc("i-2")' |
46559
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
592 6 files updated, 0 files merged, 0 files removed, 0 files unresolved |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
593 $ 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
|
594 $ 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
|
595 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
|
596 $ 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
|
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 $ 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
|
599 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
|
600 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
|
601 (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
|
602 $ 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
|
603 $ 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
|
604 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
|
605 $ 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
|
606 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
|
607 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
|
608 (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
|
609 $ 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
|
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 $ 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
|
612 @ 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
|
613 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
614 +---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
|
615 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
616 | 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
|
617 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
618 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
|
619 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
620 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
|
621 |/ |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
622 o i-2: c -move-> d, s -move-> t |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
623 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
624 o i-1: a -move-> c, p -move-> s |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
625 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
626 o i-0 initial commit: a b h p q r |
45732
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 |
46543
f01696d45d1e
test-copies: add subcase titles for various "conflicting" information variant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46542
diff
changeset
|
629 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
|
630 ```````````````````````````````````````````````````````````````````````````````````````````` |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
631 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
632 Merge: |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
633 - 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
|
634 - 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
|
635 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
636 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
|
637 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
|
638 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
639 Note: |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
640 | 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
|
641 | "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
|
642 | |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
643 | 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
|
644 |
46538
2f99dedf96b1
test-copies: improve description of the G+F case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46537
diff
changeset
|
645 $ 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
|
646 |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
647 $ 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
|
648 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
|
649 $ 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
|
650 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
|
651 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
|
652 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
|
653 (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
|
654 $ 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
|
655 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
|
656 $ 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
|
657 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
|
658 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
|
659 $ 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
|
660 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
|
661 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
|
662 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
|
663 (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
|
664 $ 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
|
665 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
|
666 $ 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
|
667 @ 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
|
668 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
669 +---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
|
670 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
671 | 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
|
672 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
673 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
|
674 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
675 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
|
676 |/ |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
677 o i-2: c -move-> d, s -move-> t |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
678 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
679 o i-1: a -move-> c, p -move-> s |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
680 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
681 o i-0 initial commit: a b h p q r |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
682 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
683 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
684 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
685 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
|
686 ------------------------------------------------------------- |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
687 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
688 Merge: |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
689 - 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
|
690 - 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
|
691 - 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
|
692 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
693 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
|
694 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
|
695 |
46539
a1a06dca6941
test-copies: improve description of the G+C case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46538
diff
changeset
|
696 $ 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
|
697 |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
698 $ 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
|
699 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
|
700 $ 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
|
701 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
|
702 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
|
703 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
|
704 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
|
705 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
|
706 [1] |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
707 $ 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
|
708 (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
|
709 $ 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
|
710 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
|
711 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
712 $ 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
|
713 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
|
714 $ 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
|
715 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
|
716 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
|
717 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
|
718 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
|
719 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
|
720 [1] |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
721 $ 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
|
722 (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
|
723 $ 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
|
724 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
|
725 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
726 $ 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
|
727 @ 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
|
728 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
729 +---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
|
730 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
731 | 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
|
732 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
733 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
|
734 |/ |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
735 o i-2: c -move-> d, s -move-> t |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
736 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
737 o i-1: a -move-> c, p -move-> s |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
738 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
739 o i-0 initial commit: a b h p q r |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
740 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
741 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
742 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
743 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
744 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
|
745 -------------------------------------------------------- |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
746 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
747 Merge: |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
748 - 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
|
749 - 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
|
750 - 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
|
751 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
752 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
|
753 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
|
754 |
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
|
755 $ 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
|
756 |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
757 $ 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
|
758 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
|
759 $ 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
|
760 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
|
761 (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
|
762 $ 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
|
763 $ 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
|
764 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
|
765 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
766 $ 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
|
767 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
|
768 $ 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
|
769 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
|
770 (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
|
771 $ 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
|
772 $ 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
|
773 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
|
774 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
775 $ 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
|
776 @ 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
|
777 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
778 +---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
|
779 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
780 | 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
|
781 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
782 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
|
783 |/ |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
784 o i-2: c -move-> d, s -move-> t |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
785 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
786 o i-1: a -move-> c, p -move-> s |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
787 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
788 o i-0 initial commit: a b h p q r |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
789 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
790 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
791 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
792 $ 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
|
793 |
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
|
794 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
|
795 ------------------------------------------------------------------------------------------ |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
796 |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
797 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
|
798 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
|
799 |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
800 (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
|
801 |
46541
60c52bdb1784
test-copies: improve description of the C+H case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46540
diff
changeset
|
802 $ 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
|
803 |
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
|
804 $ hg up 'desc("i-0")' |
46555
46205a478a08
test-copies: add 3 new files with their own content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46554
diff
changeset
|
805 6 files updated, 0 files merged, 0 files removed, 0 files unresolved |
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
|
806 $ 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
|
807 $ 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
|
808 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
|
809 |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
810 $ hg up 'desc("c-1")' |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
811 2 files updated, 0 files merged, 3 files removed, 0 files unresolved |
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
|
812 $ 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
|
813 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
|
814 (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
|
815 $ 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
|
816 |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
817 $ hg up 'desc("h-1")' |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
818 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
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
|
819 $ hg merge 'desc("c-1")' |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
820 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
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
|
821 (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
|
822 $ 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
|
823 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
|
824 $ 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
|
825 @ 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
|
826 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
827 +---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
|
828 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
829 | 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
|
830 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
831 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
|
832 | | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
833 o | i-2: c -move-> d, s -move-> t |
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
|
834 | | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
835 o | i-1: a -move-> c, p -move-> s |
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
|
836 |/ |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
837 o i-0 initial commit: a b h p q r |
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
|
838 |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
839 |
46553
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
840 Variant of previous with extra changes introduced by the merge |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
841 -------------------------------------------------------------- |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
842 |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
843 Multiple cases above explicitely test cases where content are the same on both side during merge. In this section we will introduce variants for theses cases where new change are introduced to these file content during the merges. |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
844 |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
845 |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
846 Subcase: merge has same initial content on both side, but merge introduced a change |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
847 ``````````````````````````````````````````````````````````````````````````````````` |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
848 |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
849 Same as `mAEm` and `mEAm` but with extra change to the file before commiting |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
850 |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
851 - the "e-" branch renaming b to f (through 'g') |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
852 - the "a-" branch renaming d to f (through e) |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
853 |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
854 $ case_desc="merge with file update and copies info on both side - A side: rename d to f, E side: b to f, (same content for f in parent)" |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
855 |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
856 $ hg up 'desc("a-2")' |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
857 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
858 $ hg merge 'desc("e-2")' |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
859 1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !) |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
860 0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !) |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
861 (branch merge, don't forget to commit) |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
862 $ echo "content change for mAE-change-m" > f |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
863 $ hg ci -m "mAE-change-m-0 $case_desc - one way" |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
864 created new head |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
865 $ hg up 'desc("e-2")' |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
866 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
867 $ hg merge 'desc("a-2")' |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
868 1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !) |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
869 0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !) |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
870 (branch merge, don't forget to commit) |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
871 $ echo "content change for mEA-change-m" > f |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
872 $ hg ci -m "mEA-change-m-0 $case_desc - the other way" |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
873 created new head |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
874 $ hg log -G --rev '::(desc("mAE-change-m")+desc("mEA-change-m"))' |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
875 @ mEA-change-m-0 merge with file update and copies info on both side - A side: rename d to f, E side: b to f, (same content for f in parent) - the other way |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
876 |\ |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
877 +---o mAE-change-m-0 merge with file update and copies info on both side - A side: rename d to f, E side: b to f, (same content for f in parent) - one way |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
878 | |/ |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
879 | o e-2 g -move-> f |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
880 | | |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
881 | o e-1 b -move-> g |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
882 | | |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
883 o | a-2: e -move-> f |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
884 | | |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
885 o | a-1: d -move-> e |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
886 |/ |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
887 o i-2: c -move-> d, s -move-> t |
46553
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
888 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
889 o i-1: a -move-> c, p -move-> s |
46553
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
890 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
891 o i-0 initial commit: a b h p q r |
46553
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
892 |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
893 |
46782
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
894 Subcase: merge overwrite common copy information, but with extra change during the merge |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
895 ```````````````````````````````````````````````````````````````````````````````````````` |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
896 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
897 Merge: |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
898 - one with change to an unrelated file (b) |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
899 - one overwriting a file (d) with a rename (from h to i to d) |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
900 - the merge update f content |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
901 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
902 $ case_desc="merge with extra change - B side: unrelated change, F side: overwrite d with a copy (from h->i->d)" |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
903 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
904 $ hg up 'desc("f-2")' |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
905 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
906 #if no-changeset |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
907 $ hg debugindex d | ../no-linkrev |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
908 rev linkrev nodeid p1 p2 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
909 0 * d8252ab2e760 000000000000 000000000000 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
910 1 * b004912a8510 000000000000 000000000000 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
911 2 * 7b79e2fe0c89 000000000000 000000000000 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
912 3 * 17ec97e60577 d8252ab2e760 000000000000 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
913 4 * 06dabf50734c b004912a8510 17ec97e60577 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
914 5 * 19c0e3924691 17ec97e60577 b004912a8510 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
915 6 * 89c873a01d97 7b79e2fe0c89 17ec97e60577 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
916 7 * d55cb4e9ef57 000000000000 000000000000 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
917 #else |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
918 $ hg debugindex d | ../no-linkrev |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
919 rev linkrev nodeid p1 p2 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
920 0 * ae258f702dfe 000000000000 000000000000 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
921 1 * b004912a8510 000000000000 000000000000 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
922 2 * 5cce88bf349f ae258f702dfe 000000000000 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
923 3 * cc269dd788c8 b004912a8510 5cce88bf349f |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
924 4 * 51c91a115080 5cce88bf349f b004912a8510 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
925 #endif |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
926 $ hg up 'desc("b-1")' |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
927 3 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !) |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
928 2 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !) |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
929 $ hg merge 'desc("f-2")' |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
930 1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !) |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
931 0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !) |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
932 (branch merge, don't forget to commit) |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
933 $ echo "extra-change to (formelly h) during the merge" > d |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
934 $ hg ci -m "mBF-change-m-0 $case_desc - one way" |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
935 created new head |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
936 $ hg manifest --rev . --debug | grep " d" |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
937 1c334238bd42ec85c6a0d83fd1b2a898a6a3215d 644 d (no-changeset !) |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
938 cea2d99c0fde64672ef61953786fdff34f16e230 644 d (changeset !) |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
939 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
940 $ hg up 'desc("f-2")' |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
941 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
942 $ hg merge 'desc("b-1")' |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
943 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
944 (branch merge, don't forget to commit) |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
945 $ echo "extra-change to (formelly h) during the merge" > d |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
946 $ hg ci -m "mFB-change-m-0 $case_desc - the other way" |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
947 created new head |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
948 $ hg manifest --rev . --debug | grep " d" |
46811
5a0b930cfb3e
commit: get info from mergestate whether a file was merged or not
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46782
diff
changeset
|
949 1c334238bd42ec85c6a0d83fd1b2a898a6a3215d 644 d (no-changeset !) |
46782
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
950 cea2d99c0fde64672ef61953786fdff34f16e230 644 d (changeset !) |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
951 #if no-changeset |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
952 $ hg debugindex d | ../no-linkrev |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
953 rev linkrev nodeid p1 p2 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
954 0 * d8252ab2e760 000000000000 000000000000 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
955 1 * b004912a8510 000000000000 000000000000 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
956 2 * 7b79e2fe0c89 000000000000 000000000000 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
957 3 * 17ec97e60577 d8252ab2e760 000000000000 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
958 4 * 06dabf50734c b004912a8510 17ec97e60577 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
959 5 * 19c0e3924691 17ec97e60577 b004912a8510 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
960 6 * 89c873a01d97 7b79e2fe0c89 17ec97e60577 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
961 7 * d55cb4e9ef57 000000000000 000000000000 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
962 8 * 1c334238bd42 7b79e2fe0c89 000000000000 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
963 #else |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
964 $ hg debugindex d | ../no-linkrev |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
965 rev linkrev nodeid p1 p2 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
966 0 * ae258f702dfe 000000000000 000000000000 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
967 1 * b004912a8510 000000000000 000000000000 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
968 2 * 5cce88bf349f ae258f702dfe 000000000000 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
969 3 * cc269dd788c8 b004912a8510 5cce88bf349f |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
970 4 * 51c91a115080 5cce88bf349f b004912a8510 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
971 5 * cea2d99c0fde ae258f702dfe 000000000000 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
972 #endif |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
973 $ hg log -G --rev '::(desc("mBF-change-m")+desc("mFB-change-m"))' |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
974 @ mFB-change-m-0 merge with extra change - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - the other way |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
975 |\ |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
976 +---o mBF-change-m-0 merge with extra change - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - one way |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
977 | |/ |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
978 | o f-2: rename i -> d |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
979 | | |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
980 | o f-1: rename h -> i |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
981 | | |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
982 o | b-1: b update |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
983 |/ |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
984 o i-2: c -move-> d, s -move-> t |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
985 | |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
986 o i-1: a -move-> c, p -move-> s |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
987 | |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
988 o i-0 initial commit: a b h p q r |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
989 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
990 |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
991 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
|
992 ------------------------------------------------------------------ |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
993 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
994 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
|
995 ``````````````````````````````````````````````` |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
996 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
997 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
|
998 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
|
999 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
|
1000 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
|
1001 |
46812
e4696ba43ecd
test-copies: show some wrong ChangedFiles upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46811
diff
changeset
|
1002 We also touch J during some of the merge to check for unrelated change to new file during merge. |
e4696ba43ecd
test-copies: show some wrong ChangedFiles upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46811
diff
changeset
|
1003 |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1004 $ 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
|
1005 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1006 (extra unrelated changes) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1007 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1008 $ hg up 'desc("a-2")' |
46782
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
1009 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1010 $ echo j > unrelated-j |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1011 $ hg add unrelated-j |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1012 $ 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
|
1013 created new head |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1014 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1015 $ 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
|
1016 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
|
1017 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
|
1018 $ echo k > unrelated-k |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1019 $ hg add unrelated-k |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1020 $ 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
|
1021 created new head |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1022 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1023 (merge variant 1) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1024 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1025 $ hg up 'desc("mAEm")' |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1026 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
|
1027 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
|
1028 $ 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
|
1029 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
|
1030 (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
|
1031 $ 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
|
1032 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1033 (merge variant 2) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1034 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1035 $ 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
|
1036 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
|
1037 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
|
1038 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1039 $ hg merge 'desc("mAEm")' |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1040 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
|
1041 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
|
1042 (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
|
1043 $ 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
|
1044 created new head |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1045 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1046 (merge variant 3) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1047 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1048 $ hg up 'desc("mEAm")' |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1049 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
|
1050 $ 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
|
1051 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
|
1052 (branch merge, don't forget to commit) |
46812
e4696ba43ecd
test-copies: show some wrong ChangedFiles upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46811
diff
changeset
|
1053 $ echo jj > unrelated-j |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1054 $ 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
|
1055 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1056 (merge variant 4) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1057 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1058 $ hg up 'desc("j-1")' |
46812
e4696ba43ecd
test-copies: show some wrong ChangedFiles upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46811
diff
changeset
|
1059 3 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !) |
e4696ba43ecd
test-copies: show some wrong ChangedFiles upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46811
diff
changeset
|
1060 2 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !) |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1061 $ hg merge 'desc("mEAm")' |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1062 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
|
1063 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
|
1064 (branch merge, don't forget to commit) |
46812
e4696ba43ecd
test-copies: show some wrong ChangedFiles upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46811
diff
changeset
|
1065 $ echo jj > unrelated-j |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1066 $ 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
|
1067 created new head |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1068 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1069 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1070 $ 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
|
1071 @ 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
|
1072 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1073 +---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
|
1074 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1075 | | 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
|
1076 | | |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1077 | | +---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
|
1078 | | | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1079 | | | 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
|
1080 | | | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1081 | 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
|
1082 | | | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1083 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
|
1084 |/ / / |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1085 | 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
|
1086 |/|/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1087 | 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
|
1088 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1089 | 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
|
1090 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1091 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
|
1092 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1093 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
|
1094 |/ |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
1095 o i-2: c -move-> d, s -move-> t |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1096 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
1097 o i-1: a -move-> c, p -move-> s |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1098 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
1099 o i-0 initial commit: a b h p q r |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1100 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1101 |
46561
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1102 Subcase: chaining conflicting rename resolution, with actual merging happening |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1103 `````````````````````````````````````````````````````````````````````````````` |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1104 |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1105 The "mPQm" and "mQPm" case create a rename tracking conflict on file 't'. We |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1106 add more change on the respective branch and merge again. These second merge |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1107 does not involve the file 't' and the arbitration done within "mPQm" and "mQP" |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1108 about that file should stay unchanged. |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1109 |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1110 $ case_desc="chained merges (conflict -> simple) - different content" |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1111 |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1112 (extra unrelated changes) |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1113 |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1114 $ hg up 'desc("p-2")' |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1115 3 files updated, 0 files merged, 3 files removed, 0 files unresolved |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1116 $ echo s > unrelated-s |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1117 $ hg add unrelated-s |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1118 $ hg ci -m 's-1: unrelated changes (based on the "p" series of changes)' |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1119 created new head |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1120 |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1121 $ hg up 'desc("q-2")' |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1122 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1123 $ echo t > unrelated-t |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1124 $ hg add unrelated-t |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1125 $ hg ci -m 't-1: unrelated changes (based on "q" changes)' |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1126 created new head |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1127 |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1128 (merge variant 1) |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1129 |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1130 $ hg up 'desc("mPQm")' |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1131 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1132 $ hg merge 'desc("t-1")' |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1133 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1134 (branch merge, don't forget to commit) |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1135 $ hg ci -m "mPQ,Tm: $case_desc" |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1136 |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1137 (merge variant 2) |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1138 |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1139 $ hg up 'desc("t-1")' |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1140 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1141 |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1142 $ hg merge 'desc("mPQm")' |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1143 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1144 (branch merge, don't forget to commit) |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1145 $ hg ci -m "mT,PQm: $case_desc" |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1146 created new head |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1147 |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1148 (merge variant 3) |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1149 |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1150 $ hg up 'desc("mQPm")' |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1151 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1152 $ hg merge 'desc("s-1")' |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1153 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1154 (branch merge, don't forget to commit) |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1155 $ hg ci -m "mQP,Sm: $case_desc" |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1156 |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1157 (merge variant 4) |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1158 |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1159 $ hg up 'desc("s-1")' |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1160 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1161 $ hg merge 'desc("mQPm")' |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1162 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1163 (branch merge, don't forget to commit) |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1164 $ hg ci -m "mS,QPm: $case_desc" |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1165 created new head |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1166 $ hg up null --quiet |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1167 |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1168 |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1169 $ hg log -G --rev '::(desc("mPQ,Tm") + desc("mT,PQm") + desc("mQP,Sm") + desc("mS,QPm"))' |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1170 o mS,QPm: chained merges (conflict -> simple) - different content |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1171 |\ |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1172 +---o mQP,Sm: chained merges (conflict -> simple) - different content |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1173 | |/ |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1174 | | o mT,PQm: chained merges (conflict -> simple) - different content |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1175 | | |\ |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1176 | | +---o mPQ,Tm: chained merges (conflict -> simple) - different content |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1177 | | | |/ |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1178 | | | o t-1: unrelated changes (based on "q" changes) |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1179 | | | | |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1180 | o | | s-1: unrelated changes (based on the "p" series of changes) |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1181 | | | | |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1182 o-----+ mQPm-0 merge with copies info on both side - P side: rename t to v, Q side: r to v, (different content) - the other way |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1183 |/ / / |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1184 | o / mPQm-0 merge with copies info on both side - P side: rename t to v, Q side: r to v, (different content) - one way |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1185 |/|/ |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1186 | o q-2 w -move-> v |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1187 | | |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1188 | o q-1 r -move-> w |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1189 | | |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1190 o | p-2: u -move-> v |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1191 | | |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1192 o | p-1: t -move-> u |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1193 |/ |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1194 o i-2: c -move-> d, s -move-> t |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1195 | |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1196 o i-1: a -move-> c, p -move-> s |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1197 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
1198 o i-0 initial commit: a b h p q r |
46561
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1199 |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1200 |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1201 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
|
1202 ```````````````````````````````````````````````````` |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1203 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1204 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
|
1205 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
|
1206 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1207 $ 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
|
1208 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1209 (creating the change) |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1210 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1211 $ hg up 'desc("c-1")' |
46561
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1212 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1213 $ echo l > unrelated-l |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1214 $ hg add unrelated-l |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1215 $ 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
|
1216 created new head |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1217 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1218 (Merge variant 1) |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1219 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1220 $ 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
|
1221 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
|
1222 $ 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
|
1223 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
|
1224 (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
|
1225 $ 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
|
1226 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1227 (Merge variant 2) |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1228 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1229 $ 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
|
1230 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
|
1231 $ 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
|
1232 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
|
1233 (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
|
1234 $ 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
|
1235 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1236 (Merge variant 3) |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1237 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1238 $ 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
|
1239 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
|
1240 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1241 $ 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
|
1242 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
|
1243 (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
|
1244 $ 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
|
1245 created new head |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1246 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1247 (Merge variant 4) |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1248 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1249 $ 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
|
1250 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
|
1251 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1252 $ 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
|
1253 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
|
1254 (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
|
1255 $ 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
|
1256 created new head |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1257 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1258 $ 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
|
1259 @ 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
|
1260 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1261 | | 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
|
1262 | |/| |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1263 +-+---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
|
1264 | | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1265 | +---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
|
1266 | | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1267 | 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
|
1268 | | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1269 | | 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
|
1270 | |/| |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1271 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
|
1272 |/ / |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1273 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
|
1274 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1275 | 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
|
1276 |/ |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
1277 o i-2: c -move-> d, s -move-> t |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1278 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
1279 o i-1: a -move-> c, p -move-> s |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1280 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
1281 o i-0 initial commit: a b h p q r |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1282 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1283 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1284 |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1285 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
|
1286 `````````````````````````````````````````````````````` |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1287 |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1288 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
|
1289 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1290 $ 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
|
1291 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1292 (extra unrelated changes) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1293 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1294 $ 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
|
1295 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
|
1296 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
|
1297 $ echo n > unrelated-n |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1298 $ hg add unrelated-n |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1299 $ 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
|
1300 created new head |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1301 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1302 $ 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
|
1303 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
|
1304 $ echo o > unrelated-o |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1305 $ hg add unrelated-o |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1306 $ 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
|
1307 created new head |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1308 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1309 (merge variant 1) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1310 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1311 $ hg up 'desc("mFGm")' |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1312 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
|
1313 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
|
1314 $ 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
|
1315 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
|
1316 (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
|
1317 $ 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
|
1318 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1319 (merge variant 2) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1320 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1321 $ 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
|
1322 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
|
1323 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
|
1324 $ hg merge 'desc("FGm")' |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1325 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
|
1326 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
|
1327 (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
|
1328 $ 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
|
1329 created new head |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1330 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1331 (merge variant 3) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1332 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1333 $ hg up 'desc("mGFm")' |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1334 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
|
1335 $ 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
|
1336 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
|
1337 (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
|
1338 $ 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
|
1339 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1340 (merge variant 4) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1341 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1342 $ 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
|
1343 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
|
1344 $ hg merge 'desc("mGFm")' |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1345 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
|
1346 (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
|
1347 $ 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
|
1348 created new head |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1349 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1350 $ 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
|
1351 @ 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
|
1352 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1353 +---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
|
1354 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1355 | | 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
|
1356 | | |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1357 | | +---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
|
1358 | | | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1359 | | | 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
|
1360 | | | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1361 | 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
|
1362 | | | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1363 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
|
1364 |/ / / |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1365 | 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
|
1366 |/|/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1367 | 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
|
1368 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1369 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
|
1370 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
1371 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
|
1372 |/ |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
1373 o i-2: c -move-> d, s -move-> t |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1374 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
1375 o i-1: a -move-> c, p -move-> s |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1376 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
1377 o i-0 initial commit: a b h p q r |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1378 |
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
|
1379 |
46554
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1380 Subcase: chaining conflicting rename resolution, with extra change during the merge |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1381 ``````````````````````````````````````````````````````````````````````````````````` |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1382 |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1383 The "mEA-change-m-0" and "mAE-change-m-0" case create a rename tracking conflict on file 'f'. We |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1384 add more change on the respective branch and merge again. These second merge |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1385 does not involve the file 'f' and the arbitration done within "mAEm" and "mEA" |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1386 about that file should stay unchanged. |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1387 |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1388 $ case_desc="chained merges (conflict+change -> simple) - same content on both branch in the initial merge" |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1389 |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1390 |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1391 (merge variant 1) |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1392 |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1393 $ hg up 'desc("mAE-change-m")' |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1394 2 files updated, 0 files merged, 3 files removed, 0 files unresolved |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1395 $ hg merge 'desc("k-1")' |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1396 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1397 (branch merge, don't forget to commit) |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1398 $ hg ci -m "mAE-change,Km: $case_desc" |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1399 |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1400 (merge variant 2) |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1401 |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1402 $ hg up 'desc("k-1")' |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1403 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1404 |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1405 $ hg merge 'desc("mAE-change-m")' |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1406 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1407 (branch merge, don't forget to commit) |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1408 $ hg ci -m "mK,AE-change-m: $case_desc" |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1409 created new head |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1410 |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1411 (merge variant 3) |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1412 |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1413 $ hg up 'desc("mEA-change-m")' |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1414 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1415 $ hg merge 'desc("j-1")' |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1416 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1417 (branch merge, don't forget to commit) |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1418 $ hg ci -m "mEA-change,Jm: $case_desc" |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1419 |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1420 (merge variant 4) |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1421 |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1422 $ hg up 'desc("j-1")' |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1423 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1424 $ hg merge 'desc("mEA-change-m")' |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1425 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1426 (branch merge, don't forget to commit) |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1427 $ hg ci -m "mJ,EA-change-m: $case_desc" |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1428 created new head |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1429 |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1430 |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1431 $ hg log -G --rev '::(desc("mAE-change,Km") + desc("mK,AE-change-m") + desc("mEA-change,Jm") + desc("mJ,EA-change-m"))' |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1432 @ mJ,EA-change-m: chained merges (conflict+change -> simple) - same content on both branch in the initial merge |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1433 |\ |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1434 +---o mEA-change,Jm: chained merges (conflict+change -> simple) - same content on both branch in the initial merge |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1435 | |/ |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1436 | | o mK,AE-change-m: chained merges (conflict+change -> simple) - same content on both branch in the initial merge |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1437 | | |\ |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1438 | | +---o mAE-change,Km: chained merges (conflict+change -> simple) - same content on both branch in the initial merge |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1439 | | | |/ |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1440 | | | o k-1: unrelated changes (based on "e" changes) |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1441 | | | | |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1442 | o | | j-1: unrelated changes (based on the "a" series of changes) |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1443 | | | | |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1444 o-----+ mEA-change-m-0 merge with file update and copies info on both side - A side: rename d to f, E side: b to f, (same content for f in parent) - the other way |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1445 |/ / / |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1446 | o / mAE-change-m-0 merge with file update and copies info on both side - A side: rename d to f, E side: b to f, (same content for f in parent) - one way |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1447 |/|/ |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1448 | o e-2 g -move-> f |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1449 | | |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1450 | o e-1 b -move-> g |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1451 | | |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1452 o | a-2: e -move-> f |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1453 | | |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1454 o | a-1: d -move-> e |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1455 |/ |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
1456 o i-2: c -move-> d, s -move-> t |
46554
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1457 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
1458 o i-1: a -move-> c, p -move-> s |
46554
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1459 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
1460 o i-0 initial commit: a b h p q r |
46554
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1461 |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1462 |
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
|
1463 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
|
1464 ---------------------------- |
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
|
1465 |
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
|
1466 $ 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
|
1467 |
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
|
1468 (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
|
1469 |
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
|
1470 $ 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
|
1471 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
|
1472 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
|
1473 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
|
1474 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
|
1475 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
|
1476 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
|
1477 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
|
1478 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
|
1479 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
|
1480 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
|
1481 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
|
1482 h-1: b -(move)-> d |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
1483 i-0 initial commit: a b h p q r |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
1484 i-1: a -move-> c, p -move-> s |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
1485 i-2: c -move-> d, s -move-> t |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1486 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
|
1487 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
|
1488 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
|
1489 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
|
1490 mAE,Km: chained merges (conflict -> simple) - same content everywhere |
46554
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1491 mAE-change,Km: chained merges (conflict+change -> simple) - same content on both branch in the initial merge |
46553
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
1492 mAE-change-m-0 merge with file update and copies info on both side - A side: rename d to f, E side: b to f, (same content for f in parent) - one way |
46536
19f490690880
test-copies: improve description of the A+E case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46535
diff
changeset
|
1493 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
|
1494 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
|
1495 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
|
1496 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
|
1497 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
|
1498 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
|
1499 mBDm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - one way |
46782
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
1500 mBF-change-m-0 merge with extra change - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - 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
|
1501 mBFm-0 simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - one way |
46560
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
1502 mBRm-0 simple merge - B side: unrelated change, R side: overwrite d with a copy (from r->x->t) different content - one way |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1503 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
|
1504 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
|
1505 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
|
1506 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
|
1507 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
|
1508 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
|
1509 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
|
1510 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
|
1511 mEA,Jm: chained merges (conflict -> simple) - same content everywhere |
46554
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1512 mEA-change,Jm: chained merges (conflict+change -> simple) - same content on both branch in the initial merge |
46553
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
1513 mEA-change-m-0 merge with file update and copies info on both side - A side: rename d to f, E side: b to f, (same content for f in parent) - the other way |
46536
19f490690880
test-copies: improve description of the A+E case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46535
diff
changeset
|
1514 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 |
46782
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
1515 mFB-change-m-0 merge with extra change - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - 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
|
1516 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
|
1517 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
|
1518 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
|
1519 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
|
1520 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
|
1521 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
|
1522 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
|
1523 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 |
46554
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1524 mJ,EA-change-m: chained merges (conflict+change -> simple) - same content on both branch in the initial merge |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1525 mJ,EAm: chained merges (conflict -> simple) - same content everywhere |
46554
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
1526 mK,AE-change-m: chained merges (conflict+change -> simple) - same content on both branch in the initial merge |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1527 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
|
1528 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
|
1529 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
|
1530 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
|
1531 mO,FGm: chained merges (copy-overwrite -> simple) - same content |
46561
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1532 mPQ,Tm: chained merges (conflict -> simple) - different content |
46559
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
1533 mPQm-0 merge with copies info on both side - P side: rename t to v, Q side: r to v, (different content) - one way |
46561
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1534 mQP,Sm: chained merges (conflict -> simple) - different content |
46559
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
1535 mQPm-0 merge with copies info on both side - P side: rename t to v, Q side: r to v, (different content) - the other way |
46560
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
1536 mRBm-0 simple merge - B side: unrelated change, R side: overwrite d with a copy (from r->x->t) different content - the other way |
46561
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1537 mS,QPm: chained merges (conflict -> simple) - different content |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1538 mT,PQm: chained merges (conflict -> simple) - different content |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
1539 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
|
1540 o-1: unrelated changes (based on "g" changes) |
46557
067307d6589d
test-copies: add a `p` branch similar to the `a` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46556
diff
changeset
|
1541 p-1: t -move-> u |
067307d6589d
test-copies: add a `p` branch similar to the `a` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46556
diff
changeset
|
1542 p-2: u -move-> v |
46558
eb60dadd1be1
test-copies: add a `q` branch similar to the `e` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46557
diff
changeset
|
1543 q-1 r -move-> w |
eb60dadd1be1
test-copies: add a `q` branch similar to the `e` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46557
diff
changeset
|
1544 q-2 w -move-> v |
46560
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
1545 r-1: rename r -> x |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
1546 r-2: rename t -> x |
46561
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1547 s-1: unrelated changes (based on the "p" series of changes) |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1548 t-1: unrelated changes (based on "q" 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
|
1549 |
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
|
1550 |
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
|
1551 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
|
1552 =========================================================== |
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
|
1553 |
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
|
1554 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
|
1555 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
|
1556 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
|
1557 |
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
|
1558 |
45735
edf4fa06df94
upgrade: allow sidedata upgrade to modify revision flag
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45733
diff
changeset
|
1559 #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
|
1560 $ 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
|
1561 > [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
|
1562 > 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
|
1563 > 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
|
1564 > 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
|
1565 $ 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
|
1566 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
|
1567 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
|
1568 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
|
1569 generaldelta: yes yes yes |
46334
4b0192f592cf
share: move share safe functionality out of experimental
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46186
diff
changeset
|
1570 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
|
1571 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
|
1572 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
|
1573 copies-sdc: no yes no |
46705
fd55a9eb1507
revlogv2: allow upgrading to v2
Raphaël Gomès <rgomes@octobus.net>
parents:
46618
diff
changeset
|
1574 revlog-v2: no yes 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
|
1575 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
|
1576 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
|
1577 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
|
1578 $ 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
|
1579 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
|
1580 |
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
|
1581 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
|
1582 preserved: * (glob) |
46705
fd55a9eb1507
revlogv2: allow upgrading to v2
Raphaël Gomès <rgomes@octobus.net>
parents:
46618
diff
changeset
|
1583 removed: revlogv1 |
fd55a9eb1507
revlogv2: allow upgrading to v2
Raphaël Gomès <rgomes@octobus.net>
parents:
46618
diff
changeset
|
1584 added: exp-copies-sidedata-changeset, exp-revlogv2.2, exp-sidedata-flag |
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
|
1585 |
46035
6c960b708ac4
upgrade: display the list of processed revlog before proceeding
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46002
diff
changeset
|
1586 processed revlogs: |
6c960b708ac4
upgrade: display the list of processed revlog before proceeding
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46002
diff
changeset
|
1587 - all-filelogs |
6c960b708ac4
upgrade: display the list of processed revlog before proceeding
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46002
diff
changeset
|
1588 - changelog |
6c960b708ac4
upgrade: display the list of processed revlog before proceeding
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46002
diff
changeset
|
1589 - manifest |
6c960b708ac4
upgrade: display the list of processed revlog before proceeding
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46002
diff
changeset
|
1590 |
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
|
1591 #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
|
1592 |
46618
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
1593 #if upgraded-parallel |
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
1594 $ cat >> $HGRCPATH << EOF |
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
1595 > [format] |
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
1596 > exp-use-side-data = yes |
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
1597 > exp-use-copies-side-data-changeset = yes |
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
1598 > [experimental] |
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
1599 > worker.repository-upgrade=yes |
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
1600 > [worker] |
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
1601 > enabled=yes |
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
1602 > numcpus=8 |
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
1603 > EOF |
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
1604 $ hg debugformat -v |
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
1605 format-variant repo config default |
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
1606 fncache: yes yes yes |
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
1607 dotencode: yes yes yes |
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
1608 generaldelta: yes yes yes |
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
1609 share-safe: no no no |
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
1610 sparserevlog: yes yes yes |
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
1611 persistent-nodemap: no no no |
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
1612 copies-sdc: no yes no |
46705
fd55a9eb1507
revlogv2: allow upgrading to v2
Raphaël Gomès <rgomes@octobus.net>
parents:
46618
diff
changeset
|
1613 revlog-v2: no yes no |
46618
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
1614 plain-cl-delta: yes yes yes |
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
1615 compression: * (glob) |
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
1616 compression-level: default default default |
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
1617 $ hg debugupgraderepo --run --quiet |
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
1618 upgrade will perform the following actions: |
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
1619 |
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
1620 requirements |
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
1621 preserved: * (glob) |
46705
fd55a9eb1507
revlogv2: allow upgrading to v2
Raphaël Gomès <rgomes@octobus.net>
parents:
46618
diff
changeset
|
1622 removed: revlogv1 |
fd55a9eb1507
revlogv2: allow upgrading to v2
Raphaël Gomès <rgomes@octobus.net>
parents:
46618
diff
changeset
|
1623 added: exp-copies-sidedata-changeset, exp-revlogv2.2, exp-sidedata-flag |
46618
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
1624 |
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
1625 processed revlogs: |
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
1626 - all-filelogs |
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
1627 - changelog |
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
1628 - manifest |
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
1629 |
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
1630 #endif |
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
1631 |
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
|
1632 |
45735
edf4fa06df94
upgrade: allow sidedata upgrade to modify revision flag
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45733
diff
changeset
|
1633 #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
|
1634 |
46479
c2435280ca63
copy-tracing: add a --compute flag to debugchangedfiles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46334
diff
changeset
|
1635 $ 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
|
1636 added : a, ; |
c2435280ca63
copy-tracing: add a --compute flag to debugchangedfiles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46334
diff
changeset
|
1637 added : b, ; |
c2435280ca63
copy-tracing: add a --compute flag to debugchangedfiles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46334
diff
changeset
|
1638 added : h, ; |
46555
46205a478a08
test-copies: add 3 new files with their own content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46554
diff
changeset
|
1639 added : p, ; |
46205a478a08
test-copies: add 3 new files with their own content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46554
diff
changeset
|
1640 added : q, ; |
46205a478a08
test-copies: add 3 new files with their own content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46554
diff
changeset
|
1641 added : r, ; |
46479
c2435280ca63
copy-tracing: add a --compute flag to debugchangedfiles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46334
diff
changeset
|
1642 |
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
|
1643 $ 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
|
1644 > 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
|
1645 > 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
|
1646 > 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
|
1647 > 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
|
1648 > 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
|
1649 ##### 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
|
1650 1 sidedata entries |
46555
46205a478a08
test-copies: add 3 new files with their own content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46554
diff
changeset
|
1651 entry-0014 size 64 |
46205a478a08
test-copies: add 3 new files with their own content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46554
diff
changeset
|
1652 '\x00\x00\x00\x06\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\x00\x04\x00\x00\x00\x04\x00\x00\x00\x00\x04\x00\x00\x00\x05\x00\x00\x00\x00\x04\x00\x00\x00\x06\x00\x00\x00\x00abhpqr' |
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
|
1653 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
|
1654 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
|
1655 added : h, ; |
46555
46205a478a08
test-copies: add 3 new files with their own content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46554
diff
changeset
|
1656 added : p, ; |
46205a478a08
test-copies: add 3 new files with their own content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46554
diff
changeset
|
1657 added : q, ; |
46205a478a08
test-copies: add 3 new files with their own content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46554
diff
changeset
|
1658 added : r, ; |
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
|
1659 ##### 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
|
1660 1 sidedata entries |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
1661 entry-0014 size 44 |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
1662 '\x00\x00\x00\x04\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00\x0c\x00\x00\x00\x03\x00\x00\x00\x00\x06\x00\x00\x00\x04\x00\x00\x00\x02acps' |
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
|
1663 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
|
1664 added p1: c, a; |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
1665 removed : p, ; |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
1666 added p1: s, p; |
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
|
1667 ##### 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
|
1668 1 sidedata entries |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
1669 entry-0014 size 44 |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
1670 '\x00\x00\x00\x04\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00\x0c\x00\x00\x00\x03\x00\x00\x00\x00\x06\x00\x00\x00\x04\x00\x00\x00\x02cdst' |
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
|
1671 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
|
1672 added p1: d, c; |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
1673 removed : s, ; |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
1674 added p1: t, s; |
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
|
1675 ##### 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
|
1676 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
|
1677 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
|
1678 '\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
|
1679 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
|
1680 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
|
1681 ##### 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
|
1682 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
|
1683 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
|
1684 '\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
|
1685 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
|
1686 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
|
1687 ##### 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
|
1688 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
|
1689 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
|
1690 '\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
|
1691 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
|
1692 ##### 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
|
1693 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
|
1694 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
|
1695 '\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
|
1696 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
|
1697 ##### 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
|
1698 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
|
1699 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
|
1700 '\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
|
1701 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
|
1702 ##### 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
|
1703 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
|
1704 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
|
1705 '\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
|
1706 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
|
1707 ##### 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
|
1708 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
|
1709 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
|
1710 '\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
|
1711 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
|
1712 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
|
1713 ##### 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
|
1714 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
|
1715 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
|
1716 '\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
|
1717 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
|
1718 removed : g, ; |
46557
067307d6589d
test-copies: add a `p` branch similar to the `a` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46556
diff
changeset
|
1719 ##### revision "p-1" ##### |
067307d6589d
test-copies: add a `p` branch similar to the `a` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46556
diff
changeset
|
1720 1 sidedata entries |
067307d6589d
test-copies: add a `p` branch similar to the `a` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46556
diff
changeset
|
1721 entry-0014 size 24 |
067307d6589d
test-copies: add a `p` branch similar to the `a` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46556
diff
changeset
|
1722 '\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00tu' |
067307d6589d
test-copies: add a `p` branch similar to the `a` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46556
diff
changeset
|
1723 removed : t, ; |
067307d6589d
test-copies: add a `p` branch similar to the `a` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46556
diff
changeset
|
1724 added p1: u, t; |
067307d6589d
test-copies: add a `p` branch similar to the `a` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46556
diff
changeset
|
1725 ##### revision "p-2" ##### |
067307d6589d
test-copies: add a `p` branch similar to the `a` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46556
diff
changeset
|
1726 1 sidedata entries |
067307d6589d
test-copies: add a `p` branch similar to the `a` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46556
diff
changeset
|
1727 entry-0014 size 24 |
067307d6589d
test-copies: add a `p` branch similar to the `a` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46556
diff
changeset
|
1728 '\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00uv' |
067307d6589d
test-copies: add a `p` branch similar to the `a` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46556
diff
changeset
|
1729 removed : u, ; |
067307d6589d
test-copies: add a `p` branch similar to the `a` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46556
diff
changeset
|
1730 added p1: v, u; |
46558
eb60dadd1be1
test-copies: add a `q` branch similar to the `e` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46557
diff
changeset
|
1731 ##### revision "q-1 r -move-> w" ##### |
eb60dadd1be1
test-copies: add a `q` branch similar to the `e` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46557
diff
changeset
|
1732 1 sidedata entries |
eb60dadd1be1
test-copies: add a `q` branch similar to the `e` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46557
diff
changeset
|
1733 entry-0014 size 24 |
eb60dadd1be1
test-copies: add a `q` branch similar to the `e` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46557
diff
changeset
|
1734 '\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00rw' |
eb60dadd1be1
test-copies: add a `q` branch similar to the `e` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46557
diff
changeset
|
1735 removed : r, ; |
eb60dadd1be1
test-copies: add a `q` branch similar to the `e` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46557
diff
changeset
|
1736 added p1: w, r; |
eb60dadd1be1
test-copies: add a `q` branch similar to the `e` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46557
diff
changeset
|
1737 ##### revision "q-2 w -move-> v" ##### |
eb60dadd1be1
test-copies: add a `q` branch similar to the `e` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46557
diff
changeset
|
1738 1 sidedata entries |
eb60dadd1be1
test-copies: add a `q` branch similar to the `e` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46557
diff
changeset
|
1739 entry-0014 size 24 |
eb60dadd1be1
test-copies: add a `q` branch similar to the `e` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46557
diff
changeset
|
1740 '\x00\x00\x00\x02\x06\x00\x00\x00\x01\x00\x00\x00\x01\x0c\x00\x00\x00\x02\x00\x00\x00\x00vw' |
eb60dadd1be1
test-copies: add a `q` branch similar to the `e` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46557
diff
changeset
|
1741 added p1: v, w; |
eb60dadd1be1
test-copies: add a `q` branch similar to the `e` but on the new files
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46557
diff
changeset
|
1742 removed : w, ; |
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
|
1743 ##### 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
|
1744 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
|
1745 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
|
1746 '\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
|
1747 ##### 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
|
1748 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
|
1749 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
|
1750 '\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
|
1751 ##### 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
|
1752 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
|
1753 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
|
1754 '\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
|
1755 ##### 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
|
1756 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
|
1757 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
|
1758 '\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
|
1759 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
|
1760 ##### 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
|
1761 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
|
1762 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
|
1763 '\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
|
1764 ##### 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
|
1765 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
|
1766 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
|
1767 '\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
|
1768 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
|
1769 ##### 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
|
1770 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
|
1771 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
|
1772 '\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
|
1773 ##### 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
|
1774 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
|
1775 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
|
1776 '\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
|
1777 ##### 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
|
1778 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
|
1779 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
|
1780 '\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
|
1781 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
|
1782 ##### 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
|
1783 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
|
1784 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
|
1785 '\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
|
1786 merged : f, ; |
46559
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
1787 ##### revision "mPQm-0 merge with copies info on both side - P side" ##### |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
1788 1 sidedata entries |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
1789 entry-0014 size 14 |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
1790 '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00v' |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
1791 merged : v, ; |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
1792 ##### revision "mQPm-0 merge with copies info on both side - P side" ##### |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
1793 1 sidedata entries |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
1794 entry-0014 size 14 |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
1795 '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00v' |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
1796 merged : v, ; |
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
|
1797 ##### 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
|
1798 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
|
1799 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
|
1800 '\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
|
1801 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
|
1802 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
|
1803 ##### 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
|
1804 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
|
1805 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
|
1806 '\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
|
1807 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
|
1808 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
|
1809 ##### 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
|
1810 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
|
1811 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
|
1812 '\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
|
1813 ##### 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
|
1814 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
|
1815 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
|
1816 '\x00\x00\x00\x00' |
46560
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
1817 ##### revision "r-1" ##### |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
1818 1 sidedata entries |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
1819 entry-0014 size 24 |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
1820 '\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00rx' |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
1821 removed : r, ; |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
1822 added p1: x, r; |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
1823 ##### revision "r-2" ##### |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
1824 1 sidedata entries |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
1825 entry-0014 size 24 |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
1826 '\x00\x00\x00\x02\x16\x00\x00\x00\x01\x00\x00\x00\x01\x0c\x00\x00\x00\x02\x00\x00\x00\x00tx' |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
1827 touched p1: t, x; |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
1828 removed : x, ; |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
1829 ##### revision "mBRm-0 simple merge - B side" ##### |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
1830 1 sidedata entries |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
1831 entry-0014 size 4 |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
1832 '\x00\x00\x00\x00' |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
1833 ##### revision "mRBm-0 simple merge - B side" ##### |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
1834 1 sidedata entries |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
1835 entry-0014 size 4 |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
1836 '\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
|
1837 ##### 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
|
1838 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
|
1839 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
|
1840 '\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
|
1841 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
|
1842 ##### 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
|
1843 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
|
1844 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
|
1845 '\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
|
1846 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
|
1847 ##### 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
|
1848 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
|
1849 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
|
1850 '\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
|
1851 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
|
1852 ##### 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
|
1853 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
|
1854 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
|
1855 '\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
|
1856 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
|
1857 ##### 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
|
1858 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
|
1859 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
|
1860 '\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
|
1861 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
|
1862 ##### 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
|
1863 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
|
1864 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
|
1865 '\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
|
1866 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
|
1867 ##### 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
|
1868 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
|
1869 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
|
1870 '\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
|
1871 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
|
1872 ##### 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
|
1873 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
|
1874 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
|
1875 '\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
|
1876 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
|
1877 ##### 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
|
1878 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
|
1879 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
|
1880 '\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
|
1881 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
|
1882 ##### 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
|
1883 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
|
1884 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
|
1885 '\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
|
1886 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
|
1887 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
|
1888 ##### 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
|
1889 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
|
1890 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
|
1891 '\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
|
1892 ##### 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
|
1893 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
|
1894 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
|
1895 '\x00\x00\x00\x00' |
46553
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
1896 ##### revision "mAE-change-m-0 merge with file update and copies info on both side - A side" ##### |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
1897 1 sidedata entries |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
1898 entry-0014 size 14 |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
1899 '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00f' |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
1900 merged : f, ; |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
1901 ##### revision "mEA-change-m-0 merge with file update and copies info on both side - A side" ##### |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
1902 1 sidedata entries |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
1903 entry-0014 size 14 |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
1904 '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00f' |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
1905 merged : f, ; |
46782
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
1906 ##### revision "mBF-change-m-0 merge with extra change - B side" ##### |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
1907 1 sidedata entries |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
1908 entry-0014 size 14 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
1909 '\x00\x00\x00\x01\x14\x00\x00\x00\x01\x00\x00\x00\x00d' (no-upgraded no-upgraded-parallel !) |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
1910 touched : d, ; (no-upgraded no-upgraded-parallel !) |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
1911 '\x00\x00\x00\x01\x14\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded missing-correct-output !) |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
1912 touched : d, ; (upgraded missing-correct-output !) |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
1913 '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded known-bad-output !) |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
1914 merged : d, ; (upgraded known-bad-output !) |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
1915 '\x00\x00\x00\x01\x14\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded-parallel missing-correct-output !) |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
1916 touched : d, ; (upgraded-parallel missing-correct-output !) |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
1917 '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded-parallel known-bad-output !) |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
1918 merged : d, ; (upgraded-parallel known-bad-output !) |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
1919 ##### revision "mFB-change-m-0 merge with extra change - B side" ##### |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
1920 1 sidedata entries |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
1921 entry-0014 size 14 |
46811
5a0b930cfb3e
commit: get info from mergestate whether a file was merged or not
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46782
diff
changeset
|
1922 '\x00\x00\x00\x01\x14\x00\x00\x00\x01\x00\x00\x00\x00d' (no-upgraded no-upgraded-parallel !) |
5a0b930cfb3e
commit: get info from mergestate whether a file was merged or not
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46782
diff
changeset
|
1923 touched : d, ; (no-upgraded no-upgraded-parallel !) |
5a0b930cfb3e
commit: get info from mergestate whether a file was merged or not
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46782
diff
changeset
|
1924 '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded-parallel known-bad-output !) |
5a0b930cfb3e
commit: get info from mergestate whether a file was merged or not
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46782
diff
changeset
|
1925 merged : d, ; (upgraded-parallel known-bad-output !) |
5a0b930cfb3e
commit: get info from mergestate whether a file was merged or not
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46782
diff
changeset
|
1926 '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded known-bad-output !) |
5a0b930cfb3e
commit: get info from mergestate whether a file was merged or not
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46782
diff
changeset
|
1927 merged : d, ; (upgraded known-bad-output !) |
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
|
1928 ##### revision "j-1" ##### |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1929 1 sidedata entries |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1930 entry-0014 size 24 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1931 '\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
|
1932 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
|
1933 ##### revision "k-1" ##### |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1934 1 sidedata entries |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1935 entry-0014 size 24 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1936 '\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
|
1937 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
|
1938 ##### revision "mAE,Km" ##### |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1939 1 sidedata entries |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1940 entry-0014 size 4 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1941 '\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
|
1942 ##### revision "mK,AEm" ##### |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1943 1 sidedata entries |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1944 entry-0014 size 4 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1945 '\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
|
1946 ##### revision "mEA,Jm" ##### |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1947 1 sidedata entries |
46812
e4696ba43ecd
test-copies: show some wrong ChangedFiles upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46811
diff
changeset
|
1948 entry-0014 size 24 |
e4696ba43ecd
test-copies: show some wrong ChangedFiles upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46811
diff
changeset
|
1949 '\x00\x00\x00\x01\x14\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-j' (no-upgraded no-upgraded-parallel !) |
e4696ba43ecd
test-copies: show some wrong ChangedFiles upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46811
diff
changeset
|
1950 touched : unrelated-j, ; (no-upgraded no-upgraded-parallel !) |
e4696ba43ecd
test-copies: show some wrong ChangedFiles upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46811
diff
changeset
|
1951 '\x00\x00\x00\x01\x08\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-j' (upgraded known-bad-output !) |
e4696ba43ecd
test-copies: show some wrong ChangedFiles upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46811
diff
changeset
|
1952 merged : unrelated-j, ; (upgraded known-bad-output !) |
e4696ba43ecd
test-copies: show some wrong ChangedFiles upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46811
diff
changeset
|
1953 '\x00\x00\x00\x01\x08\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-j' (upgraded-parallel known-bad-output !) |
e4696ba43ecd
test-copies: show some wrong ChangedFiles upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46811
diff
changeset
|
1954 merged : unrelated-j, ; (upgraded-parallel known-bad-output !) |
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
|
1955 ##### revision "mJ,EAm" ##### |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
1956 1 sidedata entries |
46812
e4696ba43ecd
test-copies: show some wrong ChangedFiles upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46811
diff
changeset
|
1957 entry-0014 size 24 |
e4696ba43ecd
test-copies: show some wrong ChangedFiles upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46811
diff
changeset
|
1958 '\x00\x00\x00\x01\x14\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-j' (no-upgraded no-upgraded-parallel !) |
e4696ba43ecd
test-copies: show some wrong ChangedFiles upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46811
diff
changeset
|
1959 touched : unrelated-j, ; (no-upgraded no-upgraded-parallel !) |
e4696ba43ecd
test-copies: show some wrong ChangedFiles upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46811
diff
changeset
|
1960 '\x00\x00\x00\x01\x08\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-j' (upgraded known-bad-output !) |
e4696ba43ecd
test-copies: show some wrong ChangedFiles upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46811
diff
changeset
|
1961 merged : unrelated-j, ; (upgraded known-bad-output !) |
e4696ba43ecd
test-copies: show some wrong ChangedFiles upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46811
diff
changeset
|
1962 '\x00\x00\x00\x01\x08\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-j' (upgraded-parallel known-bad-output !) |
e4696ba43ecd
test-copies: show some wrong ChangedFiles upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46811
diff
changeset
|
1963 merged : unrelated-j, ; (upgraded-parallel known-bad-output !) |
46561
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1964 ##### revision "s-1" ##### |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1965 1 sidedata entries |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1966 entry-0014 size 24 |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1967 '\x00\x00\x00\x01\x04\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-s' |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1968 added : unrelated-s, ; |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1969 ##### revision "t-1" ##### |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1970 1 sidedata entries |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1971 entry-0014 size 24 |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1972 '\x00\x00\x00\x01\x04\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-t' |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1973 added : unrelated-t, ; |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1974 ##### revision "mPQ,Tm" ##### |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1975 1 sidedata entries |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1976 entry-0014 size 4 |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1977 '\x00\x00\x00\x00' |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1978 ##### revision "mT,PQm" ##### |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1979 1 sidedata entries |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1980 entry-0014 size 4 |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1981 '\x00\x00\x00\x00' |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1982 ##### revision "mQP,Sm" ##### |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1983 1 sidedata entries |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1984 entry-0014 size 4 |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1985 '\x00\x00\x00\x00' |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1986 ##### revision "mS,QPm" ##### |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1987 1 sidedata entries |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1988 entry-0014 size 4 |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
1989 '\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
|
1990 ##### revision "l-1" ##### |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1991 1 sidedata entries |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1992 entry-0014 size 24 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1993 '\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
|
1994 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
|
1995 ##### 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
|
1996 1 sidedata entries |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1997 entry-0014 size 4 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
1998 '\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
|
1999 ##### 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
|
2000 1 sidedata entries |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2001 entry-0014 size 4 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2002 '\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
|
2003 ##### 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
|
2004 1 sidedata entries |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2005 entry-0014 size 4 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2006 '\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
|
2007 ##### 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
|
2008 1 sidedata entries |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2009 entry-0014 size 4 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
2010 '\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
|
2011 ##### revision "n-1" ##### |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2012 1 sidedata entries |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2013 entry-0014 size 24 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2014 '\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
|
2015 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
|
2016 ##### revision "o-1" ##### |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2017 1 sidedata entries |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2018 entry-0014 size 24 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2019 '\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
|
2020 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
|
2021 ##### revision "mFG,Om" ##### |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2022 1 sidedata entries |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2023 entry-0014 size 4 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2024 '\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
|
2025 ##### revision "mO,FGm" ##### |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2026 1 sidedata entries |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2027 entry-0014 size 4 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2028 '\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
|
2029 ##### revision "mGF,Nm" ##### |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2030 1 sidedata entries |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2031 entry-0014 size 4 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2032 '\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
|
2033 ##### revision "mN,GFm" ##### |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2034 1 sidedata entries |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2035 entry-0014 size 4 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
2036 '\x00\x00\x00\x00' |
46554
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
2037 ##### revision "mAE-change,Km" ##### |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
2038 1 sidedata entries |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
2039 entry-0014 size 4 |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
2040 '\x00\x00\x00\x00' |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
2041 ##### revision "mK,AE-change-m" ##### |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
2042 1 sidedata entries |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
2043 entry-0014 size 4 |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
2044 '\x00\x00\x00\x00' |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
2045 ##### revision "mEA-change,Jm" ##### |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
2046 1 sidedata entries |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
2047 entry-0014 size 4 |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
2048 '\x00\x00\x00\x00' |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
2049 ##### revision "mJ,EA-change-m" ##### |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
2050 1 sidedata entries |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
2051 entry-0014 size 4 |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
2052 '\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
|
2053 |
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
|
2054 #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
|
2055 |
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
|
2056 |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
2057 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
|
2058 ============================== |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
2059 |
46159
929054848d6c
copies: properly match result during changeset centric copy tracing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46035
diff
changeset
|
2060 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
|
2061 ------------------------------------------------------------------------- |
929054848d6c
copies: properly match result during changeset centric copy tracing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46035
diff
changeset
|
2062 |
929054848d6c
copies: properly match result during changeset centric copy tracing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46035
diff
changeset
|
2063 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
|
2064 |
929054848d6c
copies: properly match result during changeset centric copy tracing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46035
diff
changeset
|
2065 $ 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
|
2066 A f |
929054848d6c
copies: properly match result during changeset centric copy tracing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46035
diff
changeset
|
2067 a |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2068 A t |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2069 p |
46159
929054848d6c
copies: properly match result during changeset centric copy tracing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46035
diff
changeset
|
2070 R a |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2071 R p |
46159
929054848d6c
copies: properly match result during changeset centric copy tracing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46035
diff
changeset
|
2072 $ 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
|
2073 A f |
929054848d6c
copies: properly match result during changeset centric copy tracing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46035
diff
changeset
|
2074 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
|
2075 |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
2076 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
|
2077 --------------------------------------------------------------- |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
2078 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
2079 - 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
|
2080 - 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
|
2081 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
2082 $ 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
|
2083 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
|
2084 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2085 +---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
|
2086 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2087 | 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
|
2088 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2089 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
|
2090 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2091 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
|
2092 |/ |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2093 o i-2: c -move-> d, s -move-> t |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
2094 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2095 o i-1: a -move-> c, p -move-> s |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
2096 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
2097 o i-0 initial commit: a b h p q r |
45732
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
2098 |
4ffe502673c3
copies: split creation of the graph and actual checking again
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45704
diff
changeset
|
2099 |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2100 $ 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
|
2101 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
|
2102 d |
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2103 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
|
2104 $ 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
|
2105 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
|
2106 d |
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2107 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
|
2108 $ 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
|
2109 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
|
2110 $ 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
|
2111 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
|
2112 $ 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
|
2113 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
|
2114 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
|
2115 d |
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2116 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
|
2117 $ 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
|
2118 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
|
2119 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
|
2120 d |
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2121 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
|
2122 $ 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
|
2123 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
|
2124 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
|
2125 a |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2126 A t |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2127 p |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2128 R a |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2129 R p |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2130 $ 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
|
2131 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
|
2132 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
|
2133 a |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2134 A t |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2135 p |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2136 R a |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2137 R p |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2138 |
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2139 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
|
2140 ------------------------------------- |
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2141 |
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2142 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
|
2143 - 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
|
2144 - 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
|
2145 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
|
2146 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
2147 $ 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
|
2148 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
|
2149 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2150 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
|
2151 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2152 | | 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
|
2153 | | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2154 +---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
|
2155 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2156 | 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
|
2157 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2158 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
|
2159 |/ |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2160 o i-2: c -move-> d, s -move-> t |
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
|
2161 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2162 o i-1: a -move-> c, p -move-> s |
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
|
2163 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
2164 o i-0 initial commit: a b h p q r |
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
|
2165 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
2166 - 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
|
2167 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
2168 $ 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
|
2169 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
|
2170 $ 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
|
2171 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
|
2172 $ 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
|
2173 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
|
2174 $ 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
|
2175 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
|
2176 $ 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
|
2177 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
|
2178 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
|
2179 $ 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
|
2180 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
|
2181 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
|
2182 $ 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
|
2183 M b |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2184 A t |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2185 p |
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
|
2186 R a |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2187 R p |
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
|
2188 $ 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
|
2189 M b |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2190 A t |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2191 p |
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
|
2192 R a |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2193 R p |
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
|
2194 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
2195 - 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
|
2196 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
2197 $ 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
|
2198 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
|
2199 $ 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
|
2200 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
|
2201 $ 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
|
2202 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
|
2203 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
|
2204 $ 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
|
2205 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
|
2206 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
|
2207 $ 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
|
2208 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
|
2209 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
|
2210 $ 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
|
2211 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
|
2212 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
|
2213 $ 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
|
2214 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
|
2215 A d |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2216 A t |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2217 p |
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
|
2218 R a |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2219 R p |
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
|
2220 $ 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
|
2221 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
|
2222 A d |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2223 A t |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2224 p |
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
|
2225 R a |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2226 R p |
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
|
2227 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
2228 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
|
2229 --------------------------------------------------- |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
2230 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
2231 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
|
2232 - 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
|
2233 - 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
|
2234 |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2235 $ 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
|
2236 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
|
2237 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2238 +---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
|
2239 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2240 | 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
|
2241 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2242 | 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
|
2243 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2244 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
|
2245 |/ |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2246 o i-2: c -move-> d, s -move-> t |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2247 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2248 o i-1: a -move-> c, p -move-> s |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2249 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
2250 o i-0 initial commit: a b h p q r |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2251 |
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
|
2252 $ 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
|
2253 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
|
2254 $ 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
|
2255 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
|
2256 $ 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
|
2257 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
|
2258 $ 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
|
2259 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
|
2260 $ 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
|
2261 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
|
2262 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
|
2263 $ 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
|
2264 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
|
2265 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
|
2266 |
44454
b8882f5d7cb4
copies-tests: update the analysis of the BD/DB cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44453
diff
changeset
|
2267 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
|
2268 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
2269 $ 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
|
2270 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
|
2271 $ 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
|
2272 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
|
2273 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
2274 $ 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
|
2275 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
|
2276 $ 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
|
2277 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
|
2278 ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 d (changeset !) |
46552
9cd4f58467af
test-copies: filter out the linkrev part of `debugindex`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46551
diff
changeset
|
2279 $ hg debugindex d | head -n 4 | ../no-linkrev |
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
|
2280 rev linkrev nodeid p1 p2 |
46552
9cd4f58467af
test-copies: filter out the linkrev part of `debugindex`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46551
diff
changeset
|
2281 0 * d8252ab2e760 000000000000 000000000000 (no-changeset !) |
9cd4f58467af
test-copies: filter out the linkrev part of `debugindex`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46551
diff
changeset
|
2282 0 * ae258f702dfe 000000000000 000000000000 (changeset !) |
9cd4f58467af
test-copies: filter out the linkrev part of `debugindex`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46551
diff
changeset
|
2283 1 * b004912a8510 000000000000 000000000000 |
9cd4f58467af
test-copies: filter out the linkrev part of `debugindex`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46551
diff
changeset
|
2284 2 * 7b79e2fe0c89 000000000000 000000000000 (no-changeset !) |
9cd4f58467af
test-copies: filter out the linkrev part of `debugindex`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46551
diff
changeset
|
2285 2 * 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
|
2286 |
45653
a357688e3c9c
tests: update/remove outdated comments in test-copies-chain-merge.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
45461
diff
changeset
|
2287 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
|
2288 |
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
|
2289 $ 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
|
2290 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
|
2291 | |
44687
1b8fd4af3318
mergestate: store about files resolved in favour of other
Pulkit Goyal <7895pulkit@gmail.com>
parents:
44678
diff
changeset
|
2292 ~ |
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
|
2293 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
2294 $ 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
|
2295 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
|
2296 | |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
2297 ~ |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
2298 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
2299 $ 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
|
2300 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
|
2301 A d |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2302 A t |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2303 p |
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
|
2304 R a |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2305 R p |
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
|
2306 $ 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
|
2307 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
|
2308 A d |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2309 A t |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2310 p |
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
|
2311 R a |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2312 R p |
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
|
2313 |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2314 |
44455
275365d85e3f
copies-tests: clarify the description of the EA/AE cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44454
diff
changeset
|
2315 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
|
2316 -------------------------------------------- |
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
|
2317 |
46543
f01696d45d1e
test-copies: add subcase titles for various "conflicting" information variant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46542
diff
changeset
|
2318 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
|
2319 `````````````````````````````````````````` |
f01696d45d1e
test-copies: add subcase titles for various "conflicting" information variant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46542
diff
changeset
|
2320 |
44455
275365d85e3f
copies-tests: clarify the description of the EA/AE cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44454
diff
changeset
|
2321 - 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
|
2322 - 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
|
2323 |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2324 $ 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
|
2325 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
|
2326 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2327 +---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
|
2328 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2329 | 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
|
2330 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2331 | 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
|
2332 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2333 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
|
2334 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2335 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
|
2336 |/ |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2337 o i-2: c -move-> d, s -move-> t |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2338 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2339 o i-1: a -move-> c, p -move-> s |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2340 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
2341 o i-0 initial commit: a b h p q r |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2342 |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2343 #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
|
2344 $ 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
|
2345 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
|
2346 $ 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
|
2347 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
|
2348 $ 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
|
2349 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
|
2350 $ 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
|
2351 e8825b386367b29fec957283a80bb47b47483fe1 644 f |
46552
9cd4f58467af
test-copies: filter out the linkrev part of `debugindex`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46551
diff
changeset
|
2352 $ hg debugindex f | ../no-linkrev |
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
|
2353 rev linkrev nodeid p1 p2 |
46552
9cd4f58467af
test-copies: filter out the linkrev part of `debugindex`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46551
diff
changeset
|
2354 0 * b76eb76580df 000000000000 000000000000 |
9cd4f58467af
test-copies: filter out the linkrev part of `debugindex`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46551
diff
changeset
|
2355 1 * e8825b386367 000000000000 000000000000 |
9cd4f58467af
test-copies: filter out the linkrev part of `debugindex`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46551
diff
changeset
|
2356 2 * 2ff93c643948 b76eb76580df e8825b386367 |
46553
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
2357 3 * 2f649fba7eb2 b76eb76580df e8825b386367 |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
2358 4 * 774e7c1637d5 e8825b386367 b76eb76580df |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2359 #else |
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2360 $ 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
|
2361 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
|
2362 $ 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
|
2363 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
|
2364 $ 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
|
2365 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
|
2366 $ 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
|
2367 ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f |
46552
9cd4f58467af
test-copies: filter out the linkrev part of `debugindex`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46551
diff
changeset
|
2368 $ hg debugindex f | ../no-linkrev |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2369 rev linkrev nodeid p1 p2 |
46552
9cd4f58467af
test-copies: filter out the linkrev part of `debugindex`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46551
diff
changeset
|
2370 0 * ae258f702dfe 000000000000 000000000000 |
46553
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
2371 1 * d3613c1ec831 ae258f702dfe 000000000000 |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
2372 2 * 05e03c868bbc ae258f702dfe 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
|
2373 #endif |
44758
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
2374 |
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
2375 # 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
|
2376 # 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
|
2377 # 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
|
2378 |
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
|
2379 $ 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
|
2380 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
|
2381 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
|
2382 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
|
2383 $ 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
|
2384 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
|
2385 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
|
2386 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
|
2387 $ 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
|
2388 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
|
2389 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
|
2390 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
|
2391 $ 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
|
2392 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
|
2393 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
|
2394 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
|
2395 $ 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
|
2396 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
|
2397 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
|
2398 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
|
2399 $ 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
|
2400 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
|
2401 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
|
2402 R b |
44758
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
2403 |
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
2404 # 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
|
2405 # |
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
2406 # 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
|
2407 # 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
|
2408 # 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
|
2409 # 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
|
2410 # |
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
2411 # 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
|
2412 # 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
|
2413 # 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
|
2414 |
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
|
2415 $ 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
|
2416 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
|
2417 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
|
2418 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
|
2419 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
|
2420 $ 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
|
2421 A f |
44758
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
2422 d (filelog !) |
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
2423 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
|
2424 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
|
2425 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
|
2426 $ 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
|
2427 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
|
2428 a |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2429 A t |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2430 p |
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
|
2431 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
|
2432 R b |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2433 R p |
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
|
2434 $ 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
|
2435 A f |
44758
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
2436 a (filelog !) |
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
2437 b (no-filelog !) |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2438 A t |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2439 p |
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
|
2440 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
|
2441 R b |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2442 R p |
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
|
2443 |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2444 |
46543
f01696d45d1e
test-copies: add subcase titles for various "conflicting" information variant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46542
diff
changeset
|
2445 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
|
2446 ```````````````````````````````````````````````````````````` |
f01696d45d1e
test-copies: add subcase titles for various "conflicting" information variant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46542
diff
changeset
|
2447 |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2448 Note: |
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2449 | 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
|
2450 | 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
|
2451 |
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2452 |
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
|
2453 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
|
2454 - 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
|
2455 - 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
|
2456 |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2457 $ 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
|
2458 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
|
2459 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2460 +---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
|
2461 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2462 | 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
|
2463 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2464 | 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
|
2465 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2466 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
|
2467 |/ |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2468 o i-2: c -move-> d, s -move-> t |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2469 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2470 o i-1: a -move-> c, p -move-> s |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2471 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
2472 o i-0 initial commit: a b h p q r |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2473 |
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
|
2474 $ 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
|
2475 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
|
2476 A d |
44687
1b8fd4af3318
mergestate: store about files resolved in favour of other
Pulkit Goyal <7895pulkit@gmail.com>
parents:
44678
diff
changeset
|
2477 h |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2478 A t |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2479 p |
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
|
2480 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
|
2481 R h |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2482 R p |
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
|
2483 $ 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
|
2484 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
|
2485 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
|
2486 h |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2487 A t |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2488 p |
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
|
2489 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
|
2490 R h |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2491 R p |
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
|
2492 $ 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
|
2493 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
|
2494 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
|
2495 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
|
2496 $ 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
|
2497 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
|
2498 $ 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
|
2499 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
|
2500 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
|
2501 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
|
2502 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
|
2503 $ 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
|
2504 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
|
2505 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
|
2506 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
|
2507 $ 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
|
2508 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
|
2509 $ 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
|
2510 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
|
2511 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
|
2512 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
|
2513 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
|
2514 |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2515 #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
|
2516 $ 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
|
2517 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
|
2518 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2519 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
|
2520 : |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
2521 o i-0 initial commit: a b h p q r |
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
|
2522 |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2523 #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
|
2524 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
|
2525 $ hg log -Gfr 'desc("mBFm-0")' d |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2526 o i-2: c -move-> d, s -move-> t |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2527 | |
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2528 ~ |
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2529 #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
|
2530 |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2531 #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
|
2532 $ 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
|
2533 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
|
2534 | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2535 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
|
2536 : |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
2537 o i-0 initial commit: a b h p q r |
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
|
2538 |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2539 #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
|
2540 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
|
2541 $ hg log -Gfr 'desc("mFBm-0")' d |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2542 o i-2: c -move-> d, s -move-> t |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2543 | |
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2544 ~ |
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2545 #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
|
2546 |
46560
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2547 |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2548 Subcase: existing copy information overwritten on one branch, with different content) |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2549 ````````````````````````````````````````````````````````````````````````````````````` |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2550 |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2551 Merge: |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2552 - one with change to an unrelated file (b) |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2553 - one overwriting a file (t) with a rename (from r to x to t), v content is not the same as on the other branch |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2554 |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2555 $ hg log -G --rev '::(desc("mBRm")+desc("mRBm"))' |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2556 o mRBm-0 simple merge - B side: unrelated change, R side: overwrite d with a copy (from r->x->t) different content - the other way |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2557 |\ |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2558 +---o mBRm-0 simple merge - B side: unrelated change, R side: overwrite d with a copy (from r->x->t) different content - one way |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2559 | |/ |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2560 | o r-2: rename t -> x |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2561 | | |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2562 | o r-1: rename r -> x |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2563 | | |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2564 o | b-1: b update |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2565 |/ |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2566 o i-2: c -move-> d, s -move-> t |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2567 | |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2568 o i-1: a -move-> c, p -move-> s |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2569 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
2570 o i-0 initial commit: a b h p q r |
46560
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2571 |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2572 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBRm-0")' |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2573 M b |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2574 A d |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2575 a |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2576 A t |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2577 r |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2578 R a |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2579 R p |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2580 R r |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2581 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mRBm-0")' |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2582 M b |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2583 A d |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2584 a |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2585 A t |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2586 r |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2587 R a |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2588 R p |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2589 R r |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2590 $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBRm-0")' |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2591 M t |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2592 r (no-filelog !) |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2593 R r |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2594 $ hg status --copies --rev 'desc("r-2")' --rev 'desc("mBRm-0")' |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2595 M b |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2596 $ hg status --copies --rev 'desc("r-1")' --rev 'desc("mBRm-0")' |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2597 M b |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2598 M t |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2599 x (no-filelog !) |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2600 R x |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2601 $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mRBm-0")' |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2602 M t |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2603 r (no-filelog !) |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2604 R r |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2605 $ hg status --copies --rev 'desc("r-2")' --rev 'desc("mRBm-0")' |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2606 M b |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2607 $ hg status --copies --rev 'desc("r-1")' --rev 'desc("mRBm-0")' |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2608 M b |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2609 M t |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2610 x (no-filelog !) |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2611 R x |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2612 |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2613 #if no-changeset |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2614 $ hg log -Gfr 'desc("mBRm-0")' d |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2615 o i-2: c -move-> d, s -move-> t |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2616 | |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2617 o i-1: a -move-> c, p -move-> s |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2618 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
2619 o i-0 initial commit: a b h p q r |
46560
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2620 |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2621 #else |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2622 BROKEN: `hg log --follow <file>` relies on filelog metadata to work |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2623 $ hg log -Gfr 'desc("mBRm-0")' d |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2624 o i-2: c -move-> d, s -move-> t |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2625 | |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2626 ~ |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2627 #endif |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2628 |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2629 #if no-changeset |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2630 $ hg log -Gfr 'desc("mRBm-0")' d |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2631 o i-2: c -move-> d, s -move-> t |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2632 | |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2633 o i-1: a -move-> c, p -move-> s |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2634 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
2635 o i-0 initial commit: a b h p q r |
46560
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2636 |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2637 #else |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2638 BROKEN: `hg log --follow <file>` relies on filelog metadata to work |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2639 $ hg log -Gfr 'desc("mRBm-0")' d |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2640 o i-2: c -move-> d, s -move-> t |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2641 | |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2642 ~ |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2643 #endif |
c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46559
diff
changeset
|
2644 |
46543
f01696d45d1e
test-copies: add subcase titles for various "conflicting" information variant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46542
diff
changeset
|
2645 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
|
2646 `````````````````````````````````````````````` |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2647 |
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
|
2648 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
|
2649 - 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
|
2650 - 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
|
2651 |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2652 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
|
2653 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
|
2654 |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2655 $ 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
|
2656 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
|
2657 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2658 +---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
|
2659 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2660 | 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
|
2661 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2662 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
|
2663 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2664 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
|
2665 |/ |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2666 o i-2: c -move-> d, s -move-> t |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2667 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2668 o i-1: a -move-> c, p -move-> s |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2669 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
2670 o i-0 initial commit: a b h p q r |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2671 |
44758
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
2672 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
|
2673 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
|
2674 |
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
2675 (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
|
2676 revision numbers) |
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
2677 |
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
|
2678 $ 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
|
2679 A d |
44758
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
2680 a (filelog !) |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2681 A t |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2682 p |
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
|
2683 R a |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2684 R p |
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
|
2685 $ 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
|
2686 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
|
2687 a |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2688 A t |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2689 p |
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
|
2690 R a |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2691 R p |
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
|
2692 $ 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
|
2693 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
|
2694 $ 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
|
2695 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
|
2696 $ 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
|
2697 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
|
2698 $ 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
|
2699 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
|
2700 |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2701 #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
|
2702 $ 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
|
2703 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
|
2704 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2705 | 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
|
2706 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2707 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
|
2708 |/ |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2709 o i-2: c -move-> d, s -move-> t |
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
|
2710 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2711 o i-1: a -move-> c, p -move-> s |
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
|
2712 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
2713 o i-0 initial commit: a b h p q r |
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
|
2714 |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2715 #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
|
2716 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
|
2717 $ 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
|
2718 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
|
2719 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2720 | 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
|
2721 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2722 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
|
2723 |/ |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2724 o i-2: c -move-> d, s -move-> t |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2725 | |
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2726 ~ |
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2727 #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
|
2728 |
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
|
2729 |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2730 #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
|
2731 $ 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
|
2732 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
|
2733 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2734 | 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
|
2735 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2736 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
|
2737 |/ |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2738 o i-2: c -move-> d, s -move-> t |
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
|
2739 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2740 o i-1: a -move-> c, p -move-> s |
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
|
2741 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
2742 o i-0 initial commit: a b h p q r |
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
|
2743 |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2744 #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
|
2745 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
|
2746 $ 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
|
2747 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
|
2748 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2749 | 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
|
2750 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2751 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
|
2752 |/ |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2753 o i-2: c -move-> d, s -move-> t |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2754 | |
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2755 ~ |
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2756 #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
|
2757 |
46543
f01696d45d1e
test-copies: add subcase titles for various "conflicting" information variant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46542
diff
changeset
|
2758 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
|
2759 ```````````````````````````````````````````````````````````````````````````````````````````` |
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
|
2760 |
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
|
2761 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
|
2762 - 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
|
2763 - 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
|
2764 |
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
|
2765 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
|
2766 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
|
2767 |
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
|
2768 |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2769 $ 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
|
2770 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
|
2771 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2772 +---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
|
2773 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2774 | 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
|
2775 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2776 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
|
2777 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2778 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
|
2779 |/ |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2780 o i-2: c -move-> d, s -move-> t |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2781 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2782 o i-1: a -move-> c, p -move-> s |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2783 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
2784 o i-0 initial commit: a b h p q r |
44678
806f1f1ba430
tests: move verification closer to setup in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44677
diff
changeset
|
2785 |
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
|
2786 |
1d6aac94e6d5
copies: explain the "arbitrary" copy source pick in case of conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46159
diff
changeset
|
2787 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
|
2788 | 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
|
2789 | "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
|
2790 | |
1d6aac94e6d5
copies: explain the "arbitrary" copy source pick in case of conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46159
diff
changeset
|
2791 | 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
|
2792 |
1d6aac94e6d5
copies: explain the "arbitrary" copy source pick in case of conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46159
diff
changeset
|
2793 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
|
2794 |
1d6aac94e6d5
copies: explain the "arbitrary" copy source pick in case of conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46159
diff
changeset
|
2795 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
|
2796 |
1d6aac94e6d5
copies: explain the "arbitrary" copy source pick in case of conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46159
diff
changeset
|
2797 $ 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
|
2798 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
|
2799 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
|
2800 $ 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
|
2801 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
|
2802 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
|
2803 |
1d6aac94e6d5
copies: explain the "arbitrary" copy source pick in case of conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46159
diff
changeset
|
2804 $ 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
|
2805 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
|
2806 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
|
2807 $ 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
|
2808 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
|
2809 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
|
2810 |
1d6aac94e6d5
copies: explain the "arbitrary" copy source pick in case of conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46159
diff
changeset
|
2811 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
|
2812 |
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
|
2813 $ 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
|
2814 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
|
2815 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
|
2816 a (filelog !) |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2817 A t |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2818 p |
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
|
2819 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
|
2820 R h |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2821 R p |
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
|
2822 $ 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
|
2823 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
|
2824 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
|
2825 h (changeset !) |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2826 A t |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2827 p |
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
|
2828 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
|
2829 R h |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2830 R p |
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
|
2831 $ 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
|
2832 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
|
2833 $ 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
|
2834 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
|
2835 $ 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
|
2836 M d |
44758
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
2837 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
|
2838 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
|
2839 $ 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
|
2840 M d |
44758
45f3f35cefe7
copies: fix the changeset based algorithm regarding merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44687
diff
changeset
|
2841 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
|
2842 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
|
2843 $ 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
|
2844 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
|
2845 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
|
2846 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
|
2847 $ 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
|
2848 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
|
2849 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
|
2850 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
|
2851 |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2852 #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
|
2853 $ 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
|
2854 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
|
2855 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2856 | 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
|
2857 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2858 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
|
2859 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2860 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
|
2861 |/ |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2862 o i-2: c -move-> d, s -move-> t |
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
|
2863 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2864 o i-1: a -move-> c, p -move-> s |
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
|
2865 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
2866 o i-0 initial commit: a b h p q r |
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
|
2867 |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2868 #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
|
2869 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
|
2870 $ 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
|
2871 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
|
2872 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2873 o i-2: c -move-> d, s -move-> t |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2874 | |
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2875 ~ |
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2876 #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
|
2877 |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2878 #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
|
2879 $ 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
|
2880 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
|
2881 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2882 | 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
|
2883 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2884 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
|
2885 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
2886 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
|
2887 |/ |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2888 o i-2: c -move-> d, s -move-> t |
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
|
2889 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2890 o i-1: a -move-> c, p -move-> s |
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
|
2891 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
2892 o i-0 initial commit: a b h p q r |
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
|
2893 |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2894 #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
|
2895 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
|
2896 $ 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
|
2897 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
|
2898 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
2899 o i-2: c -move-> d, s -move-> t |
45704
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2900 | |
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2901 ~ |
5e72827dae1e
tests: run test-copies-chain-merge.t also with copies in changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
45702
diff
changeset
|
2902 #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
|
2903 |
46559
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2904 Subcase: new copy information on both side with an actual merge happening |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2905 ````````````````````````````````````````````````````````````````````````` |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2906 |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2907 - the "p-" branch renaming 't' to 'v' (through 'u') |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2908 - the "q-" branch renaming 'r' to 'v' (through 'w') |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2909 |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2910 |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2911 $ hg log -G --rev '::(desc("mPQm")+desc("mQPm"))' |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2912 o mQPm-0 merge with copies info on both side - P side: rename t to v, Q side: r to v, (different content) - the other way |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2913 |\ |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2914 +---o mPQm-0 merge with copies info on both side - P side: rename t to v, Q side: r to v, (different content) - one way |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2915 | |/ |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2916 | o q-2 w -move-> v |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2917 | | |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2918 | o q-1 r -move-> w |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2919 | | |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2920 o | p-2: u -move-> v |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2921 | | |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2922 o | p-1: t -move-> u |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2923 |/ |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2924 o i-2: c -move-> d, s -move-> t |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2925 | |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2926 o i-1: a -move-> c, p -move-> s |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2927 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
2928 o i-0 initial commit: a b h p q r |
46559
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2929 |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2930 |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2931 #if no-changeset |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2932 $ hg manifest --debug --rev 'desc("mPQm-0")' | grep '644 v' |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2933 0946c662ef16e4e67397fd717389eb6693d41749 644 v |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2934 $ hg manifest --debug --rev 'desc("mQPm-0")' | grep '644 v' |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2935 0db3aad7fcc1ec27fab57060e327b9e864ea0cc9 644 v |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2936 $ hg manifest --debug --rev 'desc("p-2")' | grep '644 v' |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2937 3f91841cd75cadc9a1f1b4e7c1aa6d411f76032e 644 v |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2938 $ hg manifest --debug --rev 'desc("q-2")' | grep '644 v' |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2939 c43c088b811fd27983c0a9aadf44f3343cd4cd7e 644 v |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2940 $ hg debugindex v | ../no-linkrev |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2941 rev linkrev nodeid p1 p2 |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2942 0 * 3f91841cd75c 000000000000 000000000000 |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2943 1 * c43c088b811f 000000000000 000000000000 |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2944 2 * 0946c662ef16 3f91841cd75c c43c088b811f |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2945 3 * 0db3aad7fcc1 c43c088b811f 3f91841cd75c |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2946 #else |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2947 $ hg manifest --debug --rev 'desc("mPQm-0")' | grep '644 v' |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2948 65fde9f6e4d4da23b3f610e07b53673ea9541d75 644 v |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2949 $ hg manifest --debug --rev 'desc("mQPm-0")' | grep '644 v' |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2950 a098dda6413aecf154eefc976afc38b295acb7e5 644 v |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2951 $ hg manifest --debug --rev 'desc("p-2")' | grep '644 v' |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2952 5aed6a8dbff0301328c08360d24354d3d064cf0d 644 v |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2953 $ hg manifest --debug --rev 'desc("q-2")' | grep '644 v' |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2954 a38b2fa170219750dac9bc7d19df831f213ba708 644 v |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2955 $ hg debugindex v | ../no-linkrev |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2956 rev linkrev nodeid p1 p2 |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2957 0 * 5aed6a8dbff0 000000000000 000000000000 |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2958 1 * a38b2fa17021 000000000000 000000000000 |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2959 2 * 65fde9f6e4d4 5aed6a8dbff0 a38b2fa17021 |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2960 3 * a098dda6413a a38b2fa17021 5aed6a8dbff0 |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2961 #endif |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2962 |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2963 # Here the filelog based implementation is not looking at the rename |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2964 # information (because the file exist on both side). However the changelog |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2965 # based on works fine. We have different output. |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2966 |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2967 $ hg status --copies --rev 'desc("p-2")' --rev 'desc("mPQm-0")' |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2968 M v |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2969 r (no-filelog !) |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2970 R r |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2971 $ hg status --copies --rev 'desc("p-2")' --rev 'desc("mQPm-0")' |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2972 M v |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2973 r (no-filelog !) |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2974 R r |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2975 $ hg status --copies --rev 'desc("q-2")' --rev 'desc("mPQm-0")' |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2976 M v |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2977 t (no-filelog !) |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2978 R t |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2979 $ hg status --copies --rev 'desc("q-2")' --rev 'desc("mQPm-0")' |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2980 M v |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2981 t (no-filelog !) |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2982 R t |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2983 $ hg status --copies --rev 'desc("i-2")' --rev 'desc("p-2")' |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2984 A v |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2985 t |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2986 R t |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2987 $ hg status --copies --rev 'desc("i-2")' --rev 'desc("q-2")' |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2988 A v |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2989 r |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2990 R r |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2991 |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2992 # From here, we run status against revision where both source file exists. |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2993 # |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2994 # The filelog based implementation picks an arbitrary side based on revision |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2995 # numbers. So the same side "wins" whatever the parents order is. This is |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2996 # sub-optimal because depending on revision numbers means the result can be |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2997 # different from one repository to the next. |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2998 # |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
2999 # The changeset based algorithm use the parent order to break tie on conflicting |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
3000 # information and will have a different order depending on who is p1 and p2. |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
3001 # That order is stable accross repositories. (data from p1 prevails) |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
3002 |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
3003 $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mPQm-0")' |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
3004 A v |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
3005 t |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
3006 R r |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
3007 R t |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
3008 $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mQPm-0")' |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
3009 A v |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
3010 t (filelog !) |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
3011 r (no-filelog !) |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
3012 R r |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
3013 R t |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
3014 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mPQm-0")' |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
3015 A d |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
3016 a |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
3017 A v |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
3018 r (filelog !) |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
3019 p (no-filelog !) |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
3020 R a |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
3021 R p |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
3022 R r |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
3023 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mQPm-0")' |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
3024 A d |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
3025 a |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
3026 A v |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
3027 r |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
3028 R a |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
3029 R p |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
3030 R r |
a1273bea99cc
test-copies: introduce case combining the `p` and `q` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46558
diff
changeset
|
3031 |
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
|
3032 |
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
|
3033 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
|
3034 ------------------------------------------------------------- |
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
|
3035 |
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
|
3036 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
|
3037 - 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
|
3038 - 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
|
3039 - 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
|
3040 |
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
|
3041 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
|
3042 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
|
3043 |
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
|
3044 $ 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
|
3045 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
|
3046 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
3047 +---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
|
3048 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
3049 | 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
|
3050 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
3051 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
|
3052 |/ |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3053 o i-2: c -move-> d, s -move-> t |
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
|
3054 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3055 o i-1: a -move-> c, p -move-> s |
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
|
3056 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
3057 o i-0 initial commit: a b h p q r |
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
|
3058 |
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
|
3059 |
45670
a8fb29b05f92
salvaged: properly deal with salvaged file during copy tracing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45669
diff
changeset
|
3060 '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
|
3061 |
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
|
3062 $ 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
|
3063 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
|
3064 a (no-compatibility no-changeset !) |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3065 A t |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3066 p |
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
|
3067 R a |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3068 R p |
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
|
3069 $ 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
|
3070 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
|
3071 a (no-compatibility no-changeset !) |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3072 A t |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3073 p |
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
|
3074 R a |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3075 R p |
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
|
3076 $ 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
|
3077 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
|
3078 $ 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
|
3079 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
|
3080 $ 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
|
3081 $ 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
|
3082 |
14be07d5603c
copy-tracing: test case where a merge reverted a file deletion
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45460
diff
changeset
|
3083 |
14be07d5603c
copy-tracing: test case where a merge reverted a file deletion
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45460
diff
changeset
|
3084 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
|
3085 -------------------------------------------------------- |
14be07d5603c
copy-tracing: test case where a merge reverted a file deletion
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45460
diff
changeset
|
3086 |
14be07d5603c
copy-tracing: test case where a merge reverted a file deletion
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45460
diff
changeset
|
3087 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
|
3088 - 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
|
3089 - 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
|
3090 - 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
|
3091 |
14be07d5603c
copy-tracing: test case where a merge reverted a file deletion
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45460
diff
changeset
|
3092 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
|
3093 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
|
3094 |
14be07d5603c
copy-tracing: test case where a merge reverted a file deletion
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45460
diff
changeset
|
3095 $ 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
|
3096 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
|
3097 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
3098 +---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
|
3099 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
3100 | 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
|
3101 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
3102 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
|
3103 |/ |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3104 o i-2: c -move-> d, s -move-> t |
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
|
3105 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3106 o i-1: a -move-> c, p -move-> s |
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
|
3107 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
3108 o i-0 initial commit: a b h p q r |
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
|
3109 |
14be07d5603c
copy-tracing: test case where a merge reverted a file deletion
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45460
diff
changeset
|
3110 |
45670
a8fb29b05f92
salvaged: properly deal with salvaged file during copy tracing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45669
diff
changeset
|
3111 '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
|
3112 |
14be07d5603c
copy-tracing: test case where a merge reverted a file deletion
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45460
diff
changeset
|
3113 $ 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
|
3114 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
|
3115 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
|
3116 a (no-compatibility no-changeset !) |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3117 A t |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3118 p |
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
|
3119 R a |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3120 R p |
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
|
3121 $ 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
|
3122 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
|
3123 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
|
3124 a (no-compatibility no-changeset !) |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3125 A t |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3126 p |
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
|
3127 R a |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3128 R p |
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
|
3129 $ 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
|
3130 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
|
3131 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
|
3132 $ 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
|
3133 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
|
3134 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
|
3135 $ 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
|
3136 $ 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
|
3137 |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
3138 |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
3139 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
|
3140 ------------------------------------------------------------------------------------------ |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
3141 |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
3142 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
|
3143 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
|
3144 |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
3145 (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
|
3146 |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
3147 $ 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
|
3148 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
|
3149 |\ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
3150 +---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
|
3151 | |/ |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
3152 | 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
|
3153 | | |
46547
74e2256a56b8
test-copies: remove revision number from log
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46546
diff
changeset
|
3154 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
|
3155 | | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3156 o | i-2: c -move-> d, s -move-> t |
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
|
3157 | | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3158 o | i-1: a -move-> c, p -move-> s |
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
|
3159 |/ |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
3160 o i-0 initial commit: a b h p q r |
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
|
3161 |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
3162 |
ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45778
diff
changeset
|
3163 $ 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
|
3164 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
|
3165 b (no-compatibility no-changeset !) |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3166 A t |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3167 p |
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
|
3168 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
|
3169 R b |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3170 R p |
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
|
3171 $ 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
|
3172 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
|
3173 b |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3174 A t |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3175 p |
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
|
3176 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
|
3177 R b |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3178 R p |
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
|
3179 $ 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
|
3180 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
|
3181 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
|
3182 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
|
3183 $ 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
|
3184 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
|
3185 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
|
3186 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
|
3187 $ hg status --copies --rev 'desc("h-1")' --rev 'desc("mCH-delete-before-conflict-m")' |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3188 A t |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3189 p |
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
|
3190 R a |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3191 R p |
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
|
3192 $ hg status --copies --rev 'desc("h-1")' --rev 'desc("mHC-delete-before-conflict-m")' |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3193 A t |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3194 p |
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
|
3195 R a |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3196 R p |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
3197 |
46553
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3198 Variant of previous with extra changes introduced by the merge |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3199 -------------------------------------------------------------- |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3200 |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3201 (see case declaration for details) |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3202 |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3203 Subcase: merge has same initial content on both side, but merge introduced a change |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3204 ``````````````````````````````````````````````````````````````````````````````````` |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3205 |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3206 - the "e-" branch renaming b to f (through 'g') |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3207 - the "a-" branch renaming d to f (through e) |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3208 - the merge add new change to b |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3209 |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3210 $ hg log -G --rev '::(desc("mAE-change-m")+desc("mEA-change-m"))' |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3211 o mEA-change-m-0 merge with file update and copies info on both side - A side: rename d to f, E side: b to f, (same content for f in parent) - the other way |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3212 |\ |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3213 +---o mAE-change-m-0 merge with file update and copies info on both side - A side: rename d to f, E side: b to f, (same content for f in parent) - one way |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3214 | |/ |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3215 | o e-2 g -move-> f |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3216 | | |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3217 | o e-1 b -move-> g |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3218 | | |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3219 o | a-2: e -move-> f |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3220 | | |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3221 o | a-1: d -move-> e |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3222 |/ |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3223 o i-2: c -move-> d, s -move-> t |
46553
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3224 | |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3225 o i-1: a -move-> c, p -move-> s |
46553
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3226 | |
46610
d7d64b8c8229
tests: correct a commit description in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
46563
diff
changeset
|
3227 o i-0 initial commit: a b h p q r |
46553
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3228 |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3229 #if no-changeset |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3230 $ hg manifest --debug --rev 'desc("mAE-change-m-0")' | grep '644 f' |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3231 2f649fba7eb284e720d02b61f0546fcef694c045 644 f |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3232 $ hg manifest --debug --rev 'desc("mEA-change-m-0")' | grep '644 f' |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3233 774e7c1637d536b99e2d8ef16fd731f87a82bd09 644 f |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3234 $ hg manifest --debug --rev 'desc("a-2")' | grep '644 f' |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3235 b76eb76580df486c3d51d63c5c210d4dd43a8ac7 644 f |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3236 $ hg manifest --debug --rev 'desc("e-2")' | grep '644 f' |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3237 e8825b386367b29fec957283a80bb47b47483fe1 644 f |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3238 $ hg debugindex f | ../no-linkrev |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3239 rev linkrev nodeid p1 p2 |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3240 0 * b76eb76580df 000000000000 000000000000 |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3241 1 * e8825b386367 000000000000 000000000000 |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3242 2 * 2ff93c643948 b76eb76580df e8825b386367 |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3243 3 * 2f649fba7eb2 b76eb76580df e8825b386367 |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3244 4 * 774e7c1637d5 e8825b386367 b76eb76580df |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3245 #else |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3246 $ hg manifest --debug --rev 'desc("mAE-change-m-0")' | grep '644 f' |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3247 d3613c1ec8310a812ac4268fd853ac576b6caea5 644 f |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3248 $ hg manifest --debug --rev 'desc("mEA-change-m-0")' | grep '644 f' |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3249 05e03c868bbcab4a649cb33a238d7aa07398a469 644 f |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3250 $ hg manifest --debug --rev 'desc("a-2")' | grep '644 f' |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3251 ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3252 $ hg manifest --debug --rev 'desc("e-2")' | grep '644 f' |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3253 ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3254 $ hg debugindex f | ../no-linkrev |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3255 rev linkrev nodeid p1 p2 |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3256 0 * ae258f702dfe 000000000000 000000000000 |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3257 1 * d3613c1ec831 ae258f702dfe 000000000000 |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3258 2 * 05e03c868bbc ae258f702dfe 000000000000 |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3259 #endif |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3260 |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3261 # Here the filelog based implementation is not looking at the rename |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3262 # information (because the file exist on both side). However the changelog |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3263 # based on works fine. We have different output. |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3264 |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3265 $ hg status --copies --rev 'desc("a-2")' --rev 'desc("mAE-change-m-0")' |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3266 M f |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3267 b (no-filelog !) |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3268 R b |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3269 $ hg status --copies --rev 'desc("a-2")' --rev 'desc("mEA-change-m-0")' |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3270 M f |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3271 b (no-filelog !) |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3272 R b |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3273 $ hg status --copies --rev 'desc("e-2")' --rev 'desc("mAE-change-m-0")' |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3274 M f |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3275 d (no-filelog !) |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3276 R d |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3277 $ hg status --copies --rev 'desc("e-2")' --rev 'desc("mEA-change-m-0")' |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3278 M f |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3279 d (no-filelog !) |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3280 R d |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3281 $ hg status --copies --rev 'desc("i-2")' --rev 'desc("a-2")' |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3282 A f |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3283 d |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3284 R d |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3285 $ hg status --copies --rev 'desc("i-2")' --rev 'desc("e-2")' |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3286 A f |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3287 b |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3288 R b |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3289 |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3290 # From here, we run status against revision where both source file exists. |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3291 # |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3292 # The filelog based implementation picks an arbitrary side based on revision |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3293 # numbers. So the same side "wins" whatever the parents order is. This is |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3294 # sub-optimal because depending on revision numbers means the result can be |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3295 # different from one repository to the next. |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3296 # |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3297 # The changeset based algorithm use the parent order to break tie on conflicting |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3298 # information and will have a different order depending on who is p1 and p2. |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3299 # That order is stable accross repositories. (data from p1 prevails) |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3300 |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3301 $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mAE-change-m-0")' |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3302 A f |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3303 d |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3304 R b |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3305 R d |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3306 $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mEA-change-m-0")' |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3307 A f |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3308 d (filelog !) |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3309 b (no-filelog !) |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3310 R b |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3311 R d |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3312 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mAE-change-m-0")' |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3313 A f |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3314 a |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3315 A t |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3316 p |
46553
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3317 R a |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3318 R b |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3319 R p |
46553
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3320 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mEA-change-m-0")' |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3321 A f |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3322 a (filelog !) |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3323 b (no-filelog !) |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3324 A t |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3325 p |
46553
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3326 R a |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3327 R b |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3328 R p |
46553
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3329 |
3aef76c3fd38
test-copies: add a "change during merge" variant to the A+E test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46552
diff
changeset
|
3330 |
46782
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3331 Subcase: merge overwrite common copy information, but with extra change during the merge |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3332 ``````````````````````````````````````````````````````````````````````````````````` |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3333 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3334 Merge: |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3335 - one with change to an unrelated file (b) |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3336 - one overwriting a file (d) with a rename (from h to i to d) |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3337 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3338 $ hg log -G --rev '::(desc("mBF-change-m")+desc("mFB-change-m"))' |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3339 o mFB-change-m-0 merge with extra change - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - the other way |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3340 |\ |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3341 +---o mBF-change-m-0 merge with extra change - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - one way |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3342 | |/ |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3343 | o f-2: rename i -> d |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3344 | | |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3345 | o f-1: rename h -> i |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3346 | | |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3347 o | b-1: b update |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3348 |/ |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3349 o i-2: c -move-> d, s -move-> t |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3350 | |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3351 o i-1: a -move-> c, p -move-> s |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3352 | |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3353 o i-0 initial commit: a b h p q r |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3354 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3355 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBF-change-m-0")' |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3356 M b |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3357 A d |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3358 h (filelog !) |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3359 h (sidedata !) |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3360 a (upgraded known-bad-output !) |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3361 h (upgraded missing-correct-output !) |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3362 a (upgraded-parallel known-bad-output !) |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3363 h (upgraded-parallel missing-correct-output !) |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3364 h (changeset !) |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3365 h (compatibility !) |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3366 A t |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3367 p |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3368 R a |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3369 R h |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3370 R p |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3371 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mFB-change-m-0")' |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3372 M b |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3373 A d |
46811
5a0b930cfb3e
commit: get info from mergestate whether a file was merged or not
Pulkit Goyal <7895pulkit@gmail.com>
parents:
46782
diff
changeset
|
3374 h |
46782
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3375 A t |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3376 p |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3377 R a |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3378 R h |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3379 R p |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3380 $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBF-change-m-0")' |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3381 M d |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3382 h (no-filelog !) |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3383 R h |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3384 $ hg status --copies --rev 'desc("f-2")' --rev 'desc("mBF-change-m-0")' |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3385 M b |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3386 M d |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3387 $ hg status --copies --rev 'desc("f-1")' --rev 'desc("mBF-change-m-0")' |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3388 M b |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3389 M d |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3390 i (no-filelog !) |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3391 R i |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3392 $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mFB-change-m-0")' |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3393 M d |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3394 h (no-filelog !) |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3395 R h |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3396 $ hg status --copies --rev 'desc("f-2")' --rev 'desc("mFB-change-m-0")' |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3397 M b |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3398 M d |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3399 $ hg status --copies --rev 'desc("f-1")' --rev 'desc("mFB-change-m-0")' |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3400 M b |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3401 M d |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3402 i (no-filelog !) |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3403 R i |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3404 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3405 #if no-changeset |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3406 $ hg log -Gfr 'desc("mBF-change-m-0")' d |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3407 o mBF-change-m-0 merge with extra change - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - one way |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3408 |\ |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3409 o : f-2: rename i -> d |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3410 | : |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3411 o : f-1: rename h -> i |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3412 :/ |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3413 o i-0 initial commit: a b h p q r |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3414 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3415 #else |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3416 BROKEN: `hg log --follow <file>` relies on filelog metadata to work |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3417 $ hg log -Gfr 'desc("mBF-change-m-0")' d |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3418 o mBF-change-m-0 merge with extra change - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - one way |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3419 : |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3420 o i-2: c -move-> d, s -move-> t |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3421 | |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3422 ~ |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3423 #endif |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3424 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3425 #if no-changeset |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3426 $ hg log -Gfr 'desc("mFB-change-m-0")' d |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3427 o mFB-change-m-0 merge with extra change - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - the other way |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3428 |\ |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3429 o : f-2: rename i -> d |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3430 | : |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3431 o : f-1: rename h -> i |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3432 :/ |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3433 o i-0 initial commit: a b h p q r |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3434 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3435 #else |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3436 BROKEN: `hg log --follow <file>` relies on filelog metadata to work |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3437 $ hg log -Gfr 'desc("mFB-change-m-0")' d |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3438 o mFB-change-m-0 merge with extra change - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - the other way |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3439 : |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3440 o i-2: c -move-> d, s -move-> t |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3441 | |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3442 ~ |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3443 #endif |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3444 |
6b52cffd8d0a
test-copies: add a test updating file content while merging a pure overwrite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46706
diff
changeset
|
3445 |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
3446 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
|
3447 ------------------------------------------------------------------ |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
3448 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
3449 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
3450 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
|
3451 ``````````````````````````````````````````````` |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
3452 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
3453 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
|
3454 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
|
3455 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
|
3456 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
|
3457 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
3458 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
|
3459 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
3460 $ 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
|
3461 A f |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
3462 a (filelog !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
3463 a (sidedata !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
3464 a (upgraded !) |
46618
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
3465 a (upgraded-parallel !) |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
3466 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
3467 $ 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
|
3468 A f |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
3469 a (filelog !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
3470 a (sidedata !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
3471 a (upgraded !) |
46618
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
3472 a (upgraded-parallel !) |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
3473 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
3474 $ 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
|
3475 A f |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
3476 a (filelog !) |
46563
c19c662097e1
copies: detect case when a merge decision overwrite previous data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46561
diff
changeset
|
3477 a (sidedata !) |
c19c662097e1
copies: detect case when a merge decision overwrite previous data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46561
diff
changeset
|
3478 a (upgraded !) |
46618
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
3479 a (upgraded-parallel !) |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
3480 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
3481 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
3482 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
|
3483 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
3484 $ 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
|
3485 A f |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
3486 a (filelog !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
3487 b (sidedata !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
3488 b (upgraded !) |
46618
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
3489 b (upgraded-parallel !) |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
3490 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
3491 $ 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
|
3492 A f |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
3493 a (filelog !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
3494 b (sidedata !) |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
3495 b (upgraded !) |
46618
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
3496 b (upgraded-parallel !) |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
3497 |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
3498 $ 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
|
3499 A f |
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
3500 a (filelog !) |
46563
c19c662097e1
copies: detect case when a merge decision overwrite previous data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46561
diff
changeset
|
3501 b (sidedata !) |
c19c662097e1
copies: detect case when a merge decision overwrite previous data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46561
diff
changeset
|
3502 b (upgraded !) |
46618
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
3503 b (upgraded-parallel !) |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
3504 |
46561
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3505 Subcase: chaining conflicting rename resolution |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3506 ``````````````````````````````````````````````` |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3507 |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3508 The "mPQm" and "mQPm" case create a rename tracking conflict on file 'v'. We |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3509 add more change on the respective branch and merge again. These second merge |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3510 does not involve the file 'v' and the arbitration done within "mPQm" and "mQP" |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3511 about that file should stay unchanged. |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3512 |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3513 The result from mPQm is the same for the subsequent merge: |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3514 |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3515 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mPQm")' v |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3516 A v |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3517 r (filelog !) |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3518 p (sidedata !) |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3519 p (upgraded !) |
46618
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
3520 p (upgraded-parallel !) |
46561
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3521 |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3522 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mPQ,Tm")' v |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3523 A v |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3524 r (filelog !) |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3525 p (sidedata !) |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3526 p (upgraded !) |
46618
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
3527 p (upgraded-parallel !) |
46561
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3528 |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3529 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mT,PQm")' v |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3530 A v |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3531 r (filelog !) |
46563
c19c662097e1
copies: detect case when a merge decision overwrite previous data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46561
diff
changeset
|
3532 p (sidedata !) |
c19c662097e1
copies: detect case when a merge decision overwrite previous data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46561
diff
changeset
|
3533 p (upgraded !) |
46618
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
3534 p (upgraded-parallel !) |
46561
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3535 |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3536 |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3537 The result from mQPm is the same for the subsequent merge: |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3538 |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3539 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mQPm")' v |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3540 A v |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3541 r (no-changeset no-compatibility !) |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3542 |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3543 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mQP,Sm")' v |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3544 A v |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3545 r (no-changeset no-compatibility !) |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3546 |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3547 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mS,QPm")' v |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3548 A v |
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3549 r (filelog !) |
46563
c19c662097e1
copies: detect case when a merge decision overwrite previous data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46561
diff
changeset
|
3550 r (sidedata !) |
c19c662097e1
copies: detect case when a merge decision overwrite previous data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46561
diff
changeset
|
3551 r (upgraded !) |
46618
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
3552 r (upgraded-parallel !) |
46561
388a92023a1a
test-copies: introduce merge chains test for the P/Q merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46560
diff
changeset
|
3553 |
46544
fbc466484fc3
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46543
diff
changeset
|
3554 |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
3555 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
|
3556 ```````````````````````````````````````````````````` |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
3557 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
3558 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
|
3559 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
|
3560 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
3561 reference output: |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
3562 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
3563 $ 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
|
3564 M b |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
3565 A d |
46563
c19c662097e1
copies: detect case when a merge decision overwrite previous data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46561
diff
changeset
|
3566 a (no-changeset no-compatibility !) |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3567 A t |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3568 p |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
3569 R a |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3570 R p |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
3571 $ 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
|
3572 M b |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
3573 A d |
46563
c19c662097e1
copies: detect case when a merge decision overwrite previous data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46561
diff
changeset
|
3574 a (no-changeset no-compatibility !) |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3575 A t |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3576 p |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
3577 R a |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3578 R p |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
3579 |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
3580 chained output |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
3581 $ 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
|
3582 M b |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
3583 A d |
46563
c19c662097e1
copies: detect case when a merge decision overwrite previous data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46561
diff
changeset
|
3584 a (no-changeset no-compatibility !) |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3585 A t |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3586 p |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
3587 A unrelated-l |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
3588 R a |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3589 R p |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
3590 $ 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
|
3591 M b |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
3592 A d |
46563
c19c662097e1
copies: detect case when a merge decision overwrite previous data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46561
diff
changeset
|
3593 a (no-changeset no-compatibility !) |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3594 A t |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3595 p |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
3596 A unrelated-l |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
3597 R a |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3598 R p |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
3599 $ 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
|
3600 M b |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
3601 A d |
46563
c19c662097e1
copies: detect case when a merge decision overwrite previous data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46561
diff
changeset
|
3602 a (no-changeset no-compatibility !) |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3603 A t |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3604 p |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
3605 A unrelated-l |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
3606 R a |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3607 R p |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
3608 $ 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
|
3609 M b |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
3610 A d |
46563
c19c662097e1
copies: detect case when a merge decision overwrite previous data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46561
diff
changeset
|
3611 a (no-changeset no-compatibility !) |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3612 A t |
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3613 p |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
3614 A unrelated-l |
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
3615 R a |
46556
0ebfd02dafd5
test-copies: move the new files in the `i` branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46555
diff
changeset
|
3616 R p |
46545
3805b13ad7fe
test-copies: add test chaining multiple merges
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46544
diff
changeset
|
3617 |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
3618 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
|
3619 `````````````````````````````````````````````````````` |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
3620 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
3621 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
|
3622 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
3623 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
3624 reference output: |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
3625 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
3626 (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
|
3627 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
3628 $ 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
|
3629 A d |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
3630 a (filelog !) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
3631 h (sidedata !) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
3632 h (upgraded !) |
46618
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
3633 h (upgraded-parallel !) |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
3634 $ 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
|
3635 A d |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
3636 a (filelog !) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
3637 a (sidedata !) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
3638 a (upgraded !) |
46618
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
3639 a (upgraded-parallel !) |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
3640 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
3641 Chained output |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
3642 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
3643 $ 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
|
3644 A d |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
3645 a (filelog !) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
3646 h (sidedata !) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
3647 h (upgraded !) |
46618
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
3648 h (upgraded-parallel !) |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
3649 $ 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
|
3650 A d |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
3651 a (filelog !) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
3652 h (sidedata !) |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
3653 h (upgraded !) |
46618
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
3654 h (upgraded-parallel !) |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
3655 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
3656 |
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
3657 $ 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
|
3658 A d |
46563
c19c662097e1
copies: detect case when a merge decision overwrite previous data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46561
diff
changeset
|
3659 a (no-changeset no-compatibility !) |
46546
075b2499e3d6
test-copies: add test chaining multiple merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46545
diff
changeset
|
3660 $ 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
|
3661 A d |
46563
c19c662097e1
copies: detect case when a merge decision overwrite previous data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46561
diff
changeset
|
3662 a (no-changeset no-compatibility !) |
46554
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3663 |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3664 |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3665 Subcase: chaining conflicting rename resolution, with extra change during the merge |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3666 ``````````````````````````````````````````````````````````````````````````````````` |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3667 |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3668 The "mAEm" and "mEAm" case create a rename tracking conflict on file 'f'. We |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3669 add more change on the respective branch and merge again. These second merge |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3670 does not involve the file 'f' and the arbitration done within "mAEm" and "mEA" |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3671 about that file should stay unchanged. |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3672 |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3673 The result from mAEm is the same for the subsequent merge: |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3674 |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3675 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mAE-change-m")' f |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3676 A f |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3677 a (filelog !) |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3678 a (sidedata !) |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3679 a (upgraded !) |
46618
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
3680 a (upgraded-parallel !) |
46554
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3681 |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3682 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mAE-change,Km")' f |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3683 A f |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3684 a (filelog !) |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3685 a (sidedata !) |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3686 a (upgraded !) |
46618
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
3687 a (upgraded-parallel !) |
46554
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3688 |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3689 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mK,AE-change-m")' f |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3690 A f |
46563
c19c662097e1
copies: detect case when a merge decision overwrite previous data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46561
diff
changeset
|
3691 a (no-changeset no-compatibility !) |
46554
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3692 |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3693 |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3694 The result from mEAm is the same for the subsequent merge: |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3695 |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3696 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mEA-change-m")' f |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3697 A f |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3698 a (filelog !) |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3699 b (sidedata !) |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3700 b (upgraded !) |
46618
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
3701 b (upgraded-parallel !) |
46554
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3702 |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3703 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mEA-change,Jm")' f |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3704 A f |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3705 a (filelog !) |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3706 b (sidedata !) |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3707 b (upgraded !) |
46618
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
3708 b (upgraded-parallel !) |
46554
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3709 |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3710 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mJ,EA-change-m")' f |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3711 A f |
664bee002d1a
test-copies: introduce merge chaing test for the A/E + change tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46553
diff
changeset
|
3712 a (filelog !) |
46563
c19c662097e1
copies: detect case when a merge decision overwrite previous data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46561
diff
changeset
|
3713 b (sidedata !) |
c19c662097e1
copies: detect case when a merge decision overwrite previous data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46561
diff
changeset
|
3714 b (upgraded !) |
46618
dde86beca388
copies: tests and fix parallel computation of changed file information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46610
diff
changeset
|
3715 b (upgraded-parallel !) |