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