Mercurial > hg
annotate tests/test-copies-chain-merge.t @ 44677:4e2845d9452d
tests: collect all branch creation in one place in test-copies-chain-merge.t
I found this test case really hard to read because it requires
scrolling back and forth between the setup and the verification. The
next patch will move the verification close to the merge commits they
test. This patch prepares for that by moving all branch creation first
so they are separate from the merge commits (because many merge
commits reuse the same branches).
Differential Revision: https://phab.mercurial-scm.org/D8376
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 02 Apr 2020 13:45:10 -0700 |
parents | 25d97090c6ca |
children | 806f1f1ba430 |
rev | line source |
---|---|
44281
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
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
|
2 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
|
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 |
f9dfb56ed6e8
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 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
|
6 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
|
7 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
|
8 |
f9dfb56ed6e8
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 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
|
10 ===== |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
11 |
f9dfb56ed6e8
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 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
|
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 $ 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
|
15 > [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
|
16 > 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
|
17 > [ui] |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
18 > 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
|
19 > 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
|
20 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
21 $ 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
|
22 $ 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
|
23 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
24 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
|
25 |
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
|
26 $ touch a b h |
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
|
27 $ 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
|
28 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
|
29 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
|
30 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
|
31 $ 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
|
32 $ 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
|
33 $ 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
|
34 $ 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
|
35 $ hg log -G |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
36 @ 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
|
37 | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
38 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
|
39 | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
40 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
|
41 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
42 |
44453
68e14fecd82a
copies-tests: swap two branch description
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44444
diff
changeset
|
43 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
|
44 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
45 $ 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
|
46 $ 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
|
47 $ 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
|
48 $ 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
|
49 $ 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
|
50 @ 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
|
51 | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
52 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
|
53 | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
54 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
|
55 | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
56 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
|
57 | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
58 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
|
59 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
60 |
44453
68e14fecd82a
copies-tests: swap two branch description
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44444
diff
changeset
|
61 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
|
62 |
f9dfb56ed6e8
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 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
|
64 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
|
65 $ 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
|
66 $ 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
|
67 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
|
68 $ 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
|
69 @ 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
|
70 | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
71 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
|
72 | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
73 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
|
74 | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
75 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
|
76 |
f9dfb56ed6e8
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 |
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
|
78 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
|
79 |
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
|
80 $ 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
|
81 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
|
82 $ 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
|
83 $ 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
|
84 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
|
85 $ 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
|
86 @ 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
|
87 | |
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
|
88 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
|
89 | |
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
|
90 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
|
91 | |
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
|
92 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
|
93 |
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
|
94 |
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
|
95 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
|
96 |
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
|
97 $ 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
|
98 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
|
99 $ 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
|
100 $ 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
|
101 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
|
102 $ 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
|
103 $ 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
|
104 $ 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
|
105 $ 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
|
106 @ 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
|
107 | |
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 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
|
109 | |
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 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
|
111 | |
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 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
|
113 | |
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 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
|
115 |
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 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
|
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 $ 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
|
120 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
|
121 $ 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
|
122 $ 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
|
123 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
|
124 $ 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
|
125 $ 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
|
126 $ 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
|
127 @ 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
|
128 | |
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 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
|
130 | |
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 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
|
132 | |
4e2845d9452d
tests: collect all branch creation in one place in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44662
diff
changeset
|
133 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
|
134 | |
4e2845d9452d
tests: collect all branch creation in one place in test-copies-chain-merge.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
44662
diff
changeset
|
135 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
|
136 |
44281
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
137 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
138 Merge the two branches we just defined (in both directions) |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
139 - 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
|
140 - one with renames in them |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
141 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
142 $ 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
|
143 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
|
144 $ 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
|
145 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
|
146 (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
|
147 $ 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
|
148 $ 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
|
149 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
|
150 $ 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
|
151 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
|
152 (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
|
153 $ 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
|
154 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
|
155 $ 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
|
156 @ 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
|
157 |\ |
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
|
158 +---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
|
159 | |/ |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
160 | 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
|
161 | | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
162 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
|
163 | | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
164 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
|
165 |/ |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
166 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
|
167 | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
168 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
|
169 | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
170 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
|
171 |
f9dfb56ed6e8
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 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
|
174 - 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
|
175 - 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
|
176 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
|
177 |
f9dfb56ed6e8
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 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
|
179 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
|
180 $ 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
|
181 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
|
182 (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
|
183 $ 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
|
184 $ 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
|
185 $ 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
|
186 $ 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
|
187 $ 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
|
188 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
|
189 $ 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
|
190 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
|
191 (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
|
192 $ 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
|
193 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
|
194 $ 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
|
195 $ 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
|
196 $ 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
|
197 $ 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
|
198 @ 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
|
199 | |
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
|
200 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
|
201 |\ |
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
|
202 | | 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
|
203 | | | |
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
|
204 +---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
|
205 | |/ |
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
|
206 | 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
|
207 | | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
208 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
|
209 |/ |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
210 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
|
211 | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
212 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
|
213 | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
214 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
|
215 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
216 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
217 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
|
218 - one with change to an unrelated file |
44454
b8882f5d7cb4
copies-tests: update the analysis of the BD/DB cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44453
diff
changeset
|
219 - one deleting and recreating the file |
44281
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
220 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
221 Note: |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
222 | In this case, the merge get conflicting information since on one side we have |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
223 | a "brand new" d. and one the other one we have "d renamed from c (itself |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
224 | renamed from 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
|
225 | |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
226 | The current code arbitrarily pick one side |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
227 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
228 $ 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
|
229 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
44281
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
230 $ hg merge 'desc("d-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
|
231 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
|
232 (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
|
233 $ hg ci -m 'mBDm-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
|
234 $ hg up 'desc("d-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
|
235 2 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
|
236 $ 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
|
237 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
|
238 (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
|
239 $ hg ci -m 'mDBm-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
|
240 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
|
241 $ hg log -G --rev '::(desc("mDBm")+desc("mBDm"))' |
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
|
242 @ 18 mDBm-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
|
243 |\ |
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
|
244 +---o 17 mBDm-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
|
245 | |/ |
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 | 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
|
247 | | |
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
|
248 | o 7 d-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
|
249 | | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
250 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
|
251 |/ |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
252 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
|
253 | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
254 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
|
255 | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
256 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
|
257 |
f9dfb56ed6e8
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 |
f9dfb56ed6e8
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 Merge: |
44455
275365d85e3f
copies-tests: clarify the description of the EA/AE cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44454
diff
changeset
|
260 - 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
|
261 - 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
|
262 |
f9dfb56ed6e8
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 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
|
264 2 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
|
265 $ hg merge '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
|
266 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
|
267 (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
|
268 $ hg ci -m 'mAEm-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
|
269 $ hg up '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
|
270 2 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
|
271 $ 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
|
272 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
|
273 (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
|
274 $ hg ci -m 'mEAm-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
|
275 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
|
276 $ hg log -G --rev '::(desc("mAEm")+desc("mEAm"))' |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
277 @ 20 mEAm-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
|
278 |\ |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
279 +---o 19 mAEm-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
|
280 | |/ |
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
|
281 | o 10 e-2 g -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
|
282 | | |
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
|
283 | o 9 e-1 b -move-> g |
44281
f9dfb56ed6e8
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 | | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
285 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
|
286 | | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
287 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
|
288 |/ |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
289 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
|
290 | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
291 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
|
292 | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
293 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
|
294 |
f9dfb56ed6e8
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 |
f9dfb56ed6e8
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 Note: |
44454
b8882f5d7cb4
copies-tests: update the analysis of the BD/DB cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44453
diff
changeset
|
297 | In this case, one of the merge wrongly record a merge while there is none. |
b8882f5d7cb4
copies-tests: update the analysis of the BD/DB cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44453
diff
changeset
|
298 | This lead to bad copy tracing information to be dug up. |
44281
f9dfb56ed6e8
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 |
f9dfb56ed6e8
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 |
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
|
301 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
|
302 - 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
|
303 - 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
|
304 |
890def17d03b
copies-tests: add a test with a rename overwriting another file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44457
diff
changeset
|
305 $ hg up 'desc("i-2")' |
890def17d03b
copies-tests: add a test with a rename overwriting another file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44457
diff
changeset
|
306 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
890def17d03b
copies-tests: add a test with a rename overwriting another file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44457
diff
changeset
|
307 $ hg mv h 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
|
308 $ hg commit -m "f-1: rename h -> 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
|
309 created new head |
890def17d03b
copies-tests: add a test with a rename overwriting another file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44457
diff
changeset
|
310 $ hg mv --force i 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
|
311 $ hg commit -m "f-2: rename i -> 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
|
312 $ hg debugindex 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
|
313 rev linkrev nodeid p1 p2 |
890def17d03b
copies-tests: add a test with a rename overwriting another file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44457
diff
changeset
|
314 0 2 01c2f5eabdc4 000000000000 000000000000 |
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
|
315 1 8 b004912a8510 000000000000 000000000000 |
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
|
316 2 17 0bb5445dc4d0 01c2f5eabdc4 b004912a8510 |
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
|
317 3 22 c72365ee036f 000000000000 000000000000 |
890def17d03b
copies-tests: add a test with a rename overwriting another file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44457
diff
changeset
|
318 $ hg up 'desc("b-1")' |
890def17d03b
copies-tests: add a test with a rename overwriting another file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44457
diff
changeset
|
319 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
890def17d03b
copies-tests: add a test with a rename overwriting another file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44457
diff
changeset
|
320 $ hg merge 'desc("f-2")' |
890def17d03b
copies-tests: add a test with a rename overwriting another file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44457
diff
changeset
|
321 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
890def17d03b
copies-tests: add a test with a rename overwriting another file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44457
diff
changeset
|
322 (branch merge, don't forget to commit) |
890def17d03b
copies-tests: add a test with a rename overwriting another file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44457
diff
changeset
|
323 $ hg ci -m 'mBFm-0 simple merge - one way' |
890def17d03b
copies-tests: add a test with a rename overwriting another file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44457
diff
changeset
|
324 $ hg up 'desc("f-2")' |
890def17d03b
copies-tests: add a test with a rename overwriting another file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44457
diff
changeset
|
325 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
890def17d03b
copies-tests: add a test with a rename overwriting another file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44457
diff
changeset
|
326 $ hg merge 'desc("b-1")' |
890def17d03b
copies-tests: add a test with a rename overwriting another file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44457
diff
changeset
|
327 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
890def17d03b
copies-tests: add a test with a rename overwriting another file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44457
diff
changeset
|
328 (branch merge, don't forget to commit) |
890def17d03b
copies-tests: add a test with a rename overwriting another file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44457
diff
changeset
|
329 $ hg ci -m 'mFBm-0 simple merge - the other way' |
890def17d03b
copies-tests: add a test with a rename overwriting another file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44457
diff
changeset
|
330 created new head |
890def17d03b
copies-tests: add a test with a rename overwriting another file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44457
diff
changeset
|
331 $ hg log -G --rev '::(desc("mBFm")+desc("mFBm"))' |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
332 @ 24 mFBm-0 simple merge - the other way |
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
|
333 |\ |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
334 +---o 23 mBFm-0 simple merge - one way |
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
|
335 | |/ |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
336 | 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
|
337 | | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
338 | 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
|
339 | | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
340 o | 5 b-1: b update |
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
|
341 |/ |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
342 o 2 i-2: c -move-> 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
|
343 | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
344 o 1 i-1: a -move-> c |
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
|
345 | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
346 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
|
347 |
890def17d03b
copies-tests: add a test with a rename overwriting another file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44457
diff
changeset
|
348 |
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
|
349 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
|
350 - 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
|
351 - 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
|
352 |
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
|
353 $ hg up 'desc("i-2")' |
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
|
354 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
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
|
355 $ echo "some update" >> 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
|
356 $ hg commit -m "g-1: update 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
|
357 created new head |
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
|
358 $ hg up 'desc("d-2")' |
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
|
359 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
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
|
360 $ hg merge 'desc("g-1")' --tool :union |
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
|
361 merging 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
|
362 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
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
|
363 (branch merge, don't forget to commit) |
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
|
364 $ hg ci -m 'mDGm-0 simple merge - one way' |
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
|
365 $ hg up 'desc("g-1")' |
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
|
366 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
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
|
367 $ hg merge 'desc("d-2")' --tool :union |
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
|
368 merging 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
|
369 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
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
|
370 (branch merge, don't forget to commit) |
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
|
371 $ hg ci -m 'mGDm-0 simple merge - the other way' |
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
|
372 created new head |
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
|
373 $ hg log -G --rev '::(desc("mDGm")+desc("mGDm"))' |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
374 @ 27 mGDm-0 simple merge - the other 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
|
375 |\ |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
376 +---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
|
377 | |/ |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
378 | 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
|
379 | | |
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
|
380 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
|
381 | | |
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
|
382 o | 7 d-1 delete 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
|
383 |/ |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
384 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
|
385 | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
386 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
|
387 | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
388 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
|
389 |
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
|
390 |
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
|
391 |
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
|
392 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
|
393 - 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
|
394 - 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
|
395 |
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
|
396 $ hg up 'desc("f-2")' |
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
|
397 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
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
|
398 $ hg merge 'desc("g-1")' --tool :union |
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
|
399 merging 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
|
400 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
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
|
401 (branch merge, don't forget to commit) |
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
|
402 $ hg ci -m 'mFGm-0 simple merge - one way' |
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
|
403 created new head |
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
|
404 $ hg up 'desc("g-1")' |
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
|
405 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
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
|
406 $ hg merge 'desc("f-2")' --tool :union |
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
|
407 merging 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
|
408 0 files updated, 1 files merged, 1 files removed, 0 files unresolved |
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
|
409 (branch merge, don't forget to commit) |
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
|
410 $ hg ci -m 'mGFm-0 simple merge - the other way' |
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
|
411 created new head |
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
|
412 $ hg log -G --rev '::(desc("mGFm")+desc("mFGm"))' |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
413 @ 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
|
414 |\ |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
415 +---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
|
416 | |/ |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
417 | 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
|
418 | | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
419 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
|
420 | | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
421 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
|
422 |/ |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
423 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
|
424 | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
425 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
|
426 | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
427 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
|
428 |
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
|
429 |
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
|
430 |
44281
f9dfb56ed6e8
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 Check results |
f9dfb56ed6e8
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 ============= |
f9dfb56ed6e8
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 |
f9dfb56ed6e8
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 merging with unrelated change does not interfer wit the renames |
f9dfb56ed6e8
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 --------------------------------------------------------------- |
f9dfb56ed6e8
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 |
f9dfb56ed6e8
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 - rename on one side |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
438 - unrelated change on the other side |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
439 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
440 $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mABm")' |
f9dfb56ed6e8
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 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
|
442 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
|
443 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
|
444 $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBAm")' |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
445 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
|
446 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
|
447 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
|
448 $ hg status --copies --rev 'desc("a-2")' --rev 'desc("mABm")' |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
449 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
|
450 $ hg status --copies --rev 'desc("a-2")' --rev 'desc("mBAm")' |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
451 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
|
452 $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mABm")' |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
453 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
|
454 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
|
455 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
|
456 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
|
457 $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mBAm")' |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
458 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
|
459 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
|
460 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
|
461 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
|
462 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mABm")' |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
463 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
|
464 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
|
465 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
|
466 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
|
467 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBAm")' |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
468 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
|
469 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
|
470 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
|
471 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
|
472 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
473 merging with the side having a delete |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
474 ------------------------------------- |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
475 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
476 case summary: |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
477 - 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
|
478 - 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
|
479 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
|
480 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
481 checks: |
f9dfb56ed6e8
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 - 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
|
483 |
f9dfb56ed6e8
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 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
|
485 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
|
486 $ 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
|
487 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
|
488 $ 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
|
489 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
|
490 $ 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
|
491 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
|
492 $ 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
|
493 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
|
494 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
|
495 $ 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
|
496 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
|
497 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
|
498 $ 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
|
499 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
|
500 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
|
501 $ 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
|
502 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
|
503 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
|
504 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
505 - 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
|
506 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
507 $ 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
|
508 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
|
509 $ 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
|
510 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
|
511 $ 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
|
512 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
|
513 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
|
514 $ 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
|
515 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
|
516 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
|
517 $ 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
|
518 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
|
519 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
|
520 $ 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
|
521 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
|
522 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
|
523 $ 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
|
524 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
|
525 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
|
526 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
|
527 $ 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
|
528 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
|
529 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
|
530 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
|
531 |
f9dfb56ed6e8
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 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
|
533 --------------------------------------------------- |
f9dfb56ed6e8
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 |
f9dfb56ed6e8
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 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
|
536 - 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
|
537 - 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
|
538 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
539 Note: |
44454
b8882f5d7cb4
copies-tests: update the analysis of the BD/DB cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44453
diff
changeset
|
540 | In this case, one of the merge wrongly record a merge while there is none. |
b8882f5d7cb4
copies-tests: update the analysis of the BD/DB cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44453
diff
changeset
|
541 | This lead to bad copy tracing information to be dug up. |
44281
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
542 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
543 $ 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
|
544 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
|
545 $ 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
|
546 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
|
547 $ 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
|
548 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
|
549 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
|
550 $ 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
|
551 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
|
552 $ 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
|
553 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
|
554 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
|
555 $ 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
|
556 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
|
557 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
|
558 |
44454
b8882f5d7cb4
copies-tests: update the analysis of the BD/DB cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44453
diff
changeset
|
559 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
|
560 |
f9dfb56ed6e8
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 $ hg manifest --debug --rev 'desc("mBDm-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
|
562 0bb5445dc4d02f4e0d86cf16f9f3a411d0f17744 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
|
563 $ 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
|
564 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
|
565 |
44454
b8882f5d7cb4
copies-tests: update the analysis of the BD/DB cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44453
diff
changeset
|
566 The 0bb5445dc4d02f4e0d86cf16f9f3a411d0f17744 entry is wrong, since the file was |
b8882f5d7cb4
copies-tests: update the analysis of the BD/DB cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44453
diff
changeset
|
567 deleted on one side (then recreate) and untouched on the other side, no "merge" |
b8882f5d7cb4
copies-tests: update the analysis of the BD/DB cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44453
diff
changeset
|
568 has happened. The resulting `d` file is the untouched version from branch `D`, |
b8882f5d7cb4
copies-tests: update the analysis of the BD/DB cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44453
diff
changeset
|
569 not a merge. |
b8882f5d7cb4
copies-tests: update the analysis of the BD/DB cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44453
diff
changeset
|
570 |
44281
f9dfb56ed6e8
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 $ 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
|
572 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
|
573 $ hg manifest --debug --rev 'desc("b-1")' | 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
|
574 01c2f5eabdc4ce2bdee42b5f86311955e6c8f573 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
|
575 $ 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
|
576 rev linkrev nodeid p1 p2 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
577 0 2 01c2f5eabdc4 000000000000 000000000000 |
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
|
578 1 8 b004912a8510 000000000000 000000000000 |
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
|
579 2 17 0bb5445dc4d0 01c2f5eabdc4 b004912a8510 |
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 3 22 c72365ee036f 000000000000 000000000000 |
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 4 23 863d9bc49190 01c2f5eabdc4 c72365ee036f |
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
|
582 5 25 7bded9d9da1f 01c2f5eabdc4 000000000000 |
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
|
583 6 26 f04cac32d703 b004912a8510 7bded9d9da1f |
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
|
584 7 27 d7a5eafb9322 7bded9d9da1f b004912a8510 |
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
|
585 8 28 2ed7a51aed47 c72365ee036f 7bded9d9da1f |
44281
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
586 |
44454
b8882f5d7cb4
copies-tests: update the analysis of the BD/DB cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44453
diff
changeset
|
587 (This `hg log` output if wrong, since no merge actually happened). |
b8882f5d7cb4
copies-tests: update the analysis of the BD/DB cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44453
diff
changeset
|
588 |
44281
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
589 $ hg log -Gfr 'desc("mBDm-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
|
590 o 17 mBDm-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
|
591 |\ |
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
|
592 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
|
593 :/ |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
594 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
|
595 | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
596 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
|
597 | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
598 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
|
599 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
600 |
44454
b8882f5d7cb4
copies-tests: update the analysis of the BD/DB cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44453
diff
changeset
|
601 This `hg log` output is correct |
44281
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
602 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
603 $ 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
|
604 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
|
605 | |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
606 ~ |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
607 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
608 $ 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
|
609 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
|
610 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
|
611 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
|
612 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
|
613 $ 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
|
614 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
|
615 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
|
616 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
|
617 |
44455
275365d85e3f
copies-tests: clarify the description of the EA/AE cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44454
diff
changeset
|
618 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
|
619 -------------------------------------------- |
44281
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
620 |
44455
275365d85e3f
copies-tests: clarify the description of the EA/AE cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44454
diff
changeset
|
621 - 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
|
622 - 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
|
623 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
624 $ hg manifest --debug --rev 'desc("mAEm-0")' | grep '644 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
|
625 eb806e34ef6be4c264effd5933d31004ad15a793 644 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
|
626 $ hg manifest --debug --rev 'desc("mEAm-0")' | grep '644 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
|
627 eb806e34ef6be4c264effd5933d31004ad15a793 644 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
|
628 $ hg manifest --debug --rev 'desc("a-2")' | grep '644 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
|
629 0dd616bc7ab1a111921d95d76f69cda5c2ac539c 644 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
|
630 $ hg manifest --debug --rev 'desc("e-2")' | grep '644 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
|
631 6da5a2eecb9c833f830b67a4972366d49a9a142c 644 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
|
632 $ 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
|
633 rev linkrev nodeid p1 p2 |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
634 0 4 0dd616bc7ab1 000000000000 000000000000 |
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
|
635 1 10 6da5a2eecb9c 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
|
636 2 19 eb806e34ef6b 0dd616bc7ab1 6da5a2eecb9c |
f9dfb56ed6e8
copies: add a new test dedicated to testing chain of changeset with merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
637 $ 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
|
638 M 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
|
639 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
|
640 $ 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
|
641 M 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
|
642 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
|
643 $ 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
|
644 M 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
|
645 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
|
646 $ 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
|
647 M 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
|
648 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
|
649 $ 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
|
650 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
|
651 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
|
652 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
|
653 $ 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
|
654 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
|
655 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
|
656 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
|
657 $ 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
|
658 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
|
659 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
|
660 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
|
661 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
|
662 $ 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
|
663 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
|
664 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
|
665 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
|
666 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
|
667 $ 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
|
668 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
|
669 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
|
670 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
|
671 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
|
672 $ 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
|
673 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
|
674 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
|
675 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
|
676 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
|
677 |
890def17d03b
copies-tests: add a test with a rename overwriting another file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44457
diff
changeset
|
678 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
|
679 - 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
|
680 - 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
|
681 |
890def17d03b
copies-tests: add a test with a rename overwriting another file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44457
diff
changeset
|
682 The overwriting should take over. However, the behavior is currently buggy |
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 |
890def17d03b
copies-tests: add a test with a rename overwriting another file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44457
diff
changeset
|
684 $ 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
|
685 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
|
686 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
|
687 a (true !) |
890def17d03b
copies-tests: add a test with a rename overwriting another file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44457
diff
changeset
|
688 h (false !) |
890def17d03b
copies-tests: add a test with a rename overwriting another file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44457
diff
changeset
|
689 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
|
690 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
|
691 $ 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
|
692 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
|
693 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
|
694 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
|
695 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
|
696 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
|
697 $ 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
|
698 M 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
|
699 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
|
700 $ 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
|
701 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
|
702 M 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
|
703 $ 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
|
704 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
|
705 M 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
|
706 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
|
707 $ 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
|
708 M 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
|
709 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
|
710 $ 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
|
711 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
|
712 $ 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
|
713 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
|
714 M 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
|
715 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
|
716 |
890def17d03b
copies-tests: add a test with a rename overwriting another file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44457
diff
changeset
|
717 The following graphlog is wrong, the "a -> c -> d" chain was overwritten and should not appear. |
890def17d03b
copies-tests: add a test with a rename overwriting another file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44457
diff
changeset
|
718 |
890def17d03b
copies-tests: add a test with a rename overwriting another file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44457
diff
changeset
|
719 $ hg log -Gfr 'desc("mBFm-0")' d |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
720 o 23 mBFm-0 simple merge - one way |
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
|
721 |\ |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
722 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
|
723 | : |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
724 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
|
725 :/ |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
726 o 2 i-2: c -move-> 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
|
727 | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
728 o 1 i-1: a -move-> c |
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
|
729 | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
730 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
|
731 |
890def17d03b
copies-tests: add a test with a rename overwriting another file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44457
diff
changeset
|
732 |
890def17d03b
copies-tests: add a test with a rename overwriting another file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44457
diff
changeset
|
733 The following output is correct. |
890def17d03b
copies-tests: add a test with a rename overwriting another file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44457
diff
changeset
|
734 |
890def17d03b
copies-tests: add a test with a rename overwriting another file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44457
diff
changeset
|
735 $ 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
|
736 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
|
737 | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
738 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
|
739 : |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
740 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
|
741 |
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
|
742 |
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
|
743 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
|
744 - 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
|
745 - 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
|
746 |
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 Unlike in the 'BD/DB' cases, an actuall merge happened here. So we should |
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 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
|
749 |
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 $ 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
|
751 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
|
752 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
|
753 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
|
754 $ 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
|
755 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
|
756 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
|
757 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
|
758 $ 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
|
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 $ 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
|
761 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
|
762 $ 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
|
763 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
|
764 $ 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
|
765 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
|
766 |
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
|
767 $ 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
|
768 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
|
769 |\ |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
770 | 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
|
771 | | |
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
|
772 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
|
773 |/ |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
774 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
|
775 | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
776 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
|
777 | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
778 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
|
779 |
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
|
780 |
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
|
781 |
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
|
782 $ 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
|
783 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
|
784 |\ |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
785 | 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
|
786 | | |
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
|
787 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
|
788 |/ |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
789 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
|
790 | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
791 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
|
792 | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
793 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
|
794 |
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
|
795 |
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
|
796 |
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
|
797 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
|
798 - 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
|
799 - 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
|
800 |
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
|
801 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
|
802 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
|
803 |
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
|
804 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
|
805 | 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
|
806 | "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
|
807 | |
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
|
808 | 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
|
809 |
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
|
810 $ 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
|
811 A 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
|
812 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
|
813 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
|
814 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
|
815 $ 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
|
816 A 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
|
817 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
|
818 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
|
819 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
|
820 $ 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
|
821 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
|
822 $ 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
|
823 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
|
824 $ 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
|
825 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
|
826 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
|
827 $ 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
|
828 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
|
829 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
|
830 $ 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
|
831 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
|
832 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
|
833 $ 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
|
834 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
|
835 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
|
836 |
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
|
837 $ 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
|
838 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
|
839 |\ |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
840 | 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
|
841 | | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
842 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
|
843 | | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
844 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
|
845 |/ |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
846 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
|
847 | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
848 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
|
849 | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
850 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
|
851 |
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
|
852 |
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
|
853 |
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
|
854 $ 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
|
855 @ 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
|
856 |\ |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
857 | 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
|
858 | | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
859 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
|
860 | | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
861 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
|
862 |/ |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
863 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
|
864 | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
865 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
|
866 | |
44662
25d97090c6ca
copies-tests: remove spurious `]` in the template
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44460
diff
changeset
|
867 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
|
868 |