annotate tests/test-graft-rename.t @ 46800:186c0f6fbc16

tests: ask any chg instance to terminate before looking at sqlite dbs There are spurious errors in CI where the database is still locked, so force the daemon to quit to get deterministic behavior. Since the kill command itself is racy, also sleep 2s to give the server time to wake up and exit. Differential Revision: https://phab.mercurial-scm.org/D10244
author Joerg Sonnenberger <joerg@bec.de>
date Sat, 20 Mar 2021 00:37:57 +0100
parents 3df0bd706c40
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
28033
0707bbec682d tests: omit -p for external diff via extdiff extension for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28011
diff changeset
1
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
2 Graft from behind a move or rename
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
3 ==================================
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
4
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
5 NOTE: This is affected by issue5343, and will need updating when it's fixed
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
6
42055
b9e5f3853a97 tests: better document the graft copy case
Martin von Zweigbergk <martinvonz@google.com>
parents: 41174
diff changeset
7 Consider this topology for a regular graft:
b9e5f3853a97 tests: better document the graft copy case
Martin von Zweigbergk <martinvonz@google.com>
parents: 41174
diff changeset
8
b9e5f3853a97 tests: better document the graft copy case
Martin von Zweigbergk <martinvonz@google.com>
parents: 41174
diff changeset
9 o c1
b9e5f3853a97 tests: better document the graft copy case
Martin von Zweigbergk <martinvonz@google.com>
parents: 41174
diff changeset
10 |
b9e5f3853a97 tests: better document the graft copy case
Martin von Zweigbergk <martinvonz@google.com>
parents: 41174
diff changeset
11 | o c2
b9e5f3853a97 tests: better document the graft copy case
Martin von Zweigbergk <martinvonz@google.com>
parents: 41174
diff changeset
12 | |
b9e5f3853a97 tests: better document the graft copy case
Martin von Zweigbergk <martinvonz@google.com>
parents: 41174
diff changeset
13 | o ca # stands for "common ancestor"
b9e5f3853a97 tests: better document the graft copy case
Martin von Zweigbergk <martinvonz@google.com>
parents: 41174
diff changeset
14 |/
b9e5f3853a97 tests: better document the graft copy case
Martin von Zweigbergk <martinvonz@google.com>
parents: 41174
diff changeset
15 o cta # stands for "common topological ancestor"
b9e5f3853a97 tests: better document the graft copy case
Martin von Zweigbergk <martinvonz@google.com>
parents: 41174
diff changeset
16
b9e5f3853a97 tests: better document the graft copy case
Martin von Zweigbergk <martinvonz@google.com>
parents: 41174
diff changeset
17 Note that in issue5343, ca==cta.
b9e5f3853a97 tests: better document the graft copy case
Martin von Zweigbergk <martinvonz@google.com>
parents: 41174
diff changeset
18
b9e5f3853a97 tests: better document the graft copy case
Martin von Zweigbergk <martinvonz@google.com>
parents: 41174
diff changeset
19 The following table shows the possible cases. Here, "x->y" and, equivalently,
b9e5f3853a97 tests: better document the graft copy case
Martin von Zweigbergk <martinvonz@google.com>
parents: 41174
diff changeset
20 "y<-x", where x is an ancestor of y, means that some copy happened from x to y.
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
21
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
22 name | c1<-cta | cta<->ca | ca->c2
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
23 A.0 | | |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
24 A.1 | X | |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
25 A.2 | | X |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
26 A.3 | | | X
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
27 A.4 | X | X |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
28 A.5 | X | | X
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
29 A.6 | | X | X
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
30 A.7 | X | X | X
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
31
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
32 A.0 is trivial, and doesn't need copy tracking.
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
33 For A.1, a forward rename is recorded in the c1 pass, to be followed later.
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
34 In A.2, the rename is recorded in the c2 pass and followed backwards.
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
35 A.3 is recorded in the c2 pass as a forward rename to be duplicated on target.
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
36 In A.4, both passes of checkcopies record incomplete renames, which are
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
37 then joined in mergecopies to record a rename to be followed.
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
38 In A.5 and A.7, the c1 pass records an incomplete rename, while the c2 pass
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
39 records an incomplete divergence. The incomplete rename is then joined to the
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
40 appropriate side of the incomplete divergence, and the result is recorded as a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
41 divergence. The code doesn't distinguish at all between these two cases, since
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
42 the end result of them is the same: an incomplete divergence joined with an
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
43 incomplete rename into a divergence.
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
44 Finally, A.6 records a divergence entirely in the c2 pass.
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
45
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
46 A.4 has a degenerate case a<-b<-a->a, where checkcopies isn't needed at all.
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
47 A.5 has a special case a<-b<-b->a, which is treated like a<-b->a in a merge.
42055
b9e5f3853a97 tests: better document the graft copy case
Martin von Zweigbergk <martinvonz@google.com>
parents: 41174
diff changeset
48 A.5 has issue5343 as a special case.
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
49 A.6 has a special case a<-a<-b->a. Here, checkcopies will find a spurious
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
50 incomplete divergence, which is in fact complete. This is handled later in
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
51 mergecopies.
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
52 A.7 has 4 special cases: a<-b<-a->b (the "ping-pong" case), a<-b<-c->b,
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
53 a<-b<-a->c and a<-b<-c->a. Of these, only the "ping-pong" case is interesting,
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
54 the others are fairly trivial (a<-b<-c->b and a<-b<-a->c proceed like the base
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
55 case, a<-b<-c->a is treated the same as a<-b<-b->a).
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
56
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
57 f5a therefore tests the "ping-pong" rename case, where a file is renamed to the
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
58 same name on both branches, then the rename is backed out on one branch, and
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
59 the backout is grafted to the other branch. This creates a challenging rename
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
60 sequence of a<-b<-a->b in the graft target, topological CA, graft CA and graft
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
61 source, respectively. Since rename detection will run on the c1 side for such a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
62 sequence (as for technical reasons, we split the c1 and c2 sides not at the
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
63 graft CA, but rather at the topological CA), it will pick up a false rename,
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
64 and cause a spurious merge conflict. This false rename is always exactly the
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
65 reverse of the true rename that would be detected on the c2 side, so we can
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
66 correct for it by detecting this condition and reversing as necessary.
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
67
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
68 First, set up the repository with commits to be grafted
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
69
44041
fa808e65eabb tests: split out another ~1/2 of test-graft.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 44040
diff changeset
70 $ hg init graftmove
fa808e65eabb tests: split out another ~1/2 of test-graft.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 44040
diff changeset
71 $ cd graftmove
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
72 $ echo c1a > f1a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
73 $ echo c2a > f2a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
74 $ echo c3a > f3a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
75 $ echo c4a > f4a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
76 $ echo c5a > f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
77 $ hg ci -qAm A0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
78 $ hg mv f1a f1b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
79 $ hg mv f3a f3b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
80 $ hg mv f5a f5b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
81 $ hg ci -qAm B0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
82 $ echo c1c > f1b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
83 $ hg mv f2a f2c
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
84 $ hg mv f5b f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
85 $ echo c5c > f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
86 $ hg ci -qAm C0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
87 $ hg mv f3b f3d
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
88 $ echo c4d > f4a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
89 $ hg ci -qAm D0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
90 $ hg log -G
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
91 @ changeset: 3:b69f5839d2d9
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
92 | tag: tip
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
93 | user: test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
94 | date: Thu Jan 01 00:00:00 1970 +0000
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
95 | summary: D0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
96 |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
97 o changeset: 2:f58c7e2b28fa
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
98 | user: test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
99 | date: Thu Jan 01 00:00:00 1970 +0000
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
100 | summary: C0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
101 |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
102 o changeset: 1:3d7bba921b5d
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
103 | user: test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
104 | date: Thu Jan 01 00:00:00 1970 +0000
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
105 | summary: B0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
106 |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
107 o changeset: 0:11f7a1b56675
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
108 user: test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
109 date: Thu Jan 01 00:00:00 1970 +0000
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
110 summary: A0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
111
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
112
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
113 Test the cases A.2 (f1x), A.3 (f2x) and a special case of A.6 (f5x) where the
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
114 two renames actually converge to the same name (thus no actual divergence).
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
115
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
116 $ hg up -q 'desc("A0")'
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
117 $ HGEDITOR="echo C1 >" hg graft -r 'desc("C0")' --edit
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
118 grafting 2:f58c7e2b28fa "C0"
30197
0accd5a5ad04 mergecopies: invoke _computenonoverlap for both base and tca during merges
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30192
diff changeset
119 merging f1a and f1b to f1a
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
120 merging f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
121 $ hg status --change .
30197
0accd5a5ad04 mergecopies: invoke _computenonoverlap for both base and tca during merges
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30192
diff changeset
122 M f1a
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
123 M f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
124 A f2c
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
125 R f2a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
126 $ hg cat f1a
30197
0accd5a5ad04 mergecopies: invoke _computenonoverlap for both base and tca during merges
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30192
diff changeset
127 c1c
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
128 $ hg cat f1b
30204
1894c830ee74 copies: make _checkcopies handle copy sequences spanning the TCA (issue4028)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30201
diff changeset
129 f1b: no such file in rev c9763722f9bd
30197
0accd5a5ad04 mergecopies: invoke _computenonoverlap for both base and tca during merges
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30192
diff changeset
130 [1]
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
131
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
132 Test the cases A.0 (f4x) and A.6 (f3x)
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
133
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
134 $ HGEDITOR="echo D1 >" hg graft -r 'desc("D0")' --edit
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
135 grafting 3:b69f5839d2d9 "D0"
30201
856ead835f56 checkcopies: handle divergences contained entirely in tca::ctx
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30197
diff changeset
136 note: possible conflict - f3b was renamed multiple times to:
42110
3a7efcbdf288 copies: print list of divergent renames in sorted order
Martin von Zweigbergk <martinvonz@google.com>
parents: 42055
diff changeset
137 f3a
30201
856ead835f56 checkcopies: handle divergences contained entirely in tca::ctx
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30197
diff changeset
138 f3d
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
139
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
140 Set up the repository for some further tests
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
141
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
142 $ hg up -q "min(desc("A0"))"
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
143 $ hg mv f1a f1e
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
144 $ echo c2e > f2a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
145 $ hg mv f3a f3e
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
146 $ hg mv f4a f4e
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
147 $ hg mv f5a f5b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
148 $ hg ci -qAm "E0"
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
149 $ hg up -q "min(desc("A0"))"
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
150 $ hg cp f1a f1f
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
151 $ hg ci -qAm "F0"
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
152 $ hg up -q "min(desc("A0"))"
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
153 $ hg cp f1a f1g
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
154 $ echo c1g > f1g
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
155 $ hg ci -qAm "G0"
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
156 $ hg log -G
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
157 @ changeset: 8:ba67f08fb15a
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
158 | tag: tip
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
159 | parent: 0:11f7a1b56675
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
160 | user: test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
161 | date: Thu Jan 01 00:00:00 1970 +0000
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
162 | summary: G0
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
163 |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
164 | o changeset: 7:d376ab0d7fda
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
165 |/ parent: 0:11f7a1b56675
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
166 | user: test
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
167 | date: Thu Jan 01 00:00:00 1970 +0000
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
168 | summary: F0
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
169 |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
170 | o changeset: 6:6bd1736cab86
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
171 |/ parent: 0:11f7a1b56675
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
172 | user: test
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
173 | date: Thu Jan 01 00:00:00 1970 +0000
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
174 | summary: E0
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
175 |
30204
1894c830ee74 copies: make _checkcopies handle copy sequences spanning the TCA (issue4028)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30201
diff changeset
176 | o changeset: 5:560daee679da
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
177 | | user: test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
178 | | date: Thu Jan 01 00:00:00 1970 +0000
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
179 | | summary: D1
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
180 | |
30204
1894c830ee74 copies: make _checkcopies handle copy sequences spanning the TCA (issue4028)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30201
diff changeset
181 | o changeset: 4:c9763722f9bd
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
182 |/ parent: 0:11f7a1b56675
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
183 | user: test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
184 | date: Thu Jan 01 00:00:00 1970 +0000
30204
1894c830ee74 copies: make _checkcopies handle copy sequences spanning the TCA (issue4028)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30201
diff changeset
185 | summary: C1
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
186 |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
187 | o changeset: 3:b69f5839d2d9
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
188 | | user: test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
189 | | date: Thu Jan 01 00:00:00 1970 +0000
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
190 | | summary: D0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
191 | |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
192 | o changeset: 2:f58c7e2b28fa
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
193 | | user: test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
194 | | date: Thu Jan 01 00:00:00 1970 +0000
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
195 | | summary: C0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
196 | |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
197 | o changeset: 1:3d7bba921b5d
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
198 |/ user: test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
199 | date: Thu Jan 01 00:00:00 1970 +0000
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
200 | summary: B0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
201 |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
202 o changeset: 0:11f7a1b56675
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
203 user: test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
204 date: Thu Jan 01 00:00:00 1970 +0000
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
205 summary: A0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
206
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
207
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
208 Test the cases A.4 (f1x), the "ping-pong" special case of A.7 (f5x),
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
209 and A.3 with a local content change to be preserved (f2x).
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
210
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
211 $ hg up -q "desc("E0")"
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
212 $ HGEDITOR="echo C2 >" hg graft -r 'desc("C0")' --edit
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
213 grafting 2:f58c7e2b28fa "C0"
30204
1894c830ee74 copies: make _checkcopies handle copy sequences spanning the TCA (issue4028)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30201
diff changeset
214 merging f1e and f1b to f1e
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
215 merging f2a and f2c to f2c
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
216
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
217 Test the cases A.1 (f4x) and A.7 (f3x).
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
218
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
219 $ HGEDITOR="echo D2 >" hg graft -r 'desc("D0")' --edit
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
220 grafting 3:b69f5839d2d9 "D0"
30204
1894c830ee74 copies: make _checkcopies handle copy sequences spanning the TCA (issue4028)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30201
diff changeset
221 note: possible conflict - f3b was renamed multiple times to:
42110
3a7efcbdf288 copies: print list of divergent renames in sorted order
Martin von Zweigbergk <martinvonz@google.com>
parents: 42055
diff changeset
222 f3d
30204
1894c830ee74 copies: make _checkcopies handle copy sequences spanning the TCA (issue4028)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30201
diff changeset
223 f3e
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
224 merging f4e and f4a to f4e
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
225
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
226 $ hg cat f2c
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
227 c2e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
228
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
229 Test the case A.5 (move case, f1x).
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
230
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
231 $ hg up -q "desc("C0")"
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
232 $ HGEDITOR="echo E1 >" hg graft -r 'desc("E0")' --edit
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
233 grafting 6:6bd1736cab86 "E0"
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
234 note: possible conflict - f1a was renamed multiple times to:
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
235 f1b
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
236 f1e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
237 note: possible conflict - f3a was renamed multiple times to:
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
238 f3b
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
239 f3e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
240 merging f2c and f2a to f2c
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
241 merging f5a and f5b to f5b
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
242 $ cat f1e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
243 c1a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
244
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
245 Test the case A.5 (copy case, f1x).
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
246
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
247 $ hg up -q "desc("C0")"
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
248 $ HGEDITOR="echo F1 >" hg graft -r 'desc("F0")' --edit
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
249 grafting 7:d376ab0d7fda "F0"
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
250 BROKEN: f1f should be marked a copy from f1b
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
251 $ hg st --copies --change .
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
252 A f1f
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
253 BROKEN: f1f should have the new content from f1b (i.e. "c1c")
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
254 $ cat f1f
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
255 c1a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
256
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
257 Test the case A.5 (copy+modify case, f1x).
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
258
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
259 $ hg up -q "desc("C0")"
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
260 BROKEN: We should get a merge conflict from the 3-way merge between f1b in C0
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
261 (content "c1c") and f1g in G0 (content "c1g") with f1a in A0 as base (content
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
262 "c1a")
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
263 $ HGEDITOR="echo G1 >" hg graft -r 'desc("G0")' --edit
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
264 grafting 8:ba67f08fb15a "G0"
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
265
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
266 Check the results of the grafts tested
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
267
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
268 $ hg log -CGv --patch --git
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
269 @ changeset: 13:ef3adf6c20a4
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
270 | tag: tip
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
271 | parent: 2:f58c7e2b28fa
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
272 | user: test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
273 | date: Thu Jan 01 00:00:00 1970 +0000
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
274 | files: f1g
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
275 | description:
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
276 | G1
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
277 |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
278 |
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
279 | diff --git a/f1g b/f1g
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
280 | new file mode 100644
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
281 | --- /dev/null
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
282 | +++ b/f1g
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
283 | @@ -0,0 +1,1 @@
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
284 | +c1g
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
285 |
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
286 | o changeset: 12:b5542d755b54
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
287 |/ parent: 2:f58c7e2b28fa
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
288 | user: test
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
289 | date: Thu Jan 01 00:00:00 1970 +0000
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
290 | files: f1f
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
291 | description:
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
292 | F1
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
293 |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
294 |
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
295 | diff --git a/f1f b/f1f
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
296 | new file mode 100644
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
297 | --- /dev/null
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
298 | +++ b/f1f
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
299 | @@ -0,0 +1,1 @@
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
300 | +c1a
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
301 |
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
302 | o changeset: 11:f8a162271246
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
303 |/ parent: 2:f58c7e2b28fa
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
304 | user: test
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
305 | date: Thu Jan 01 00:00:00 1970 +0000
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
306 | files: f1e f2c f3e f4a f4e f5a f5b
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
307 | copies: f4e (f4a) f5b (f5a)
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
308 | description:
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
309 | E1
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
310 |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
311 |
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
312 | diff --git a/f1e b/f1e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
313 | new file mode 100644
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
314 | --- /dev/null
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
315 | +++ b/f1e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
316 | @@ -0,0 +1,1 @@
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
317 | +c1a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
318 | diff --git a/f2c b/f2c
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
319 | --- a/f2c
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
320 | +++ b/f2c
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
321 | @@ -1,1 +1,1 @@
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
322 | -c2a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
323 | +c2e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
324 | diff --git a/f3e b/f3e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
325 | new file mode 100644
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
326 | --- /dev/null
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
327 | +++ b/f3e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
328 | @@ -0,0 +1,1 @@
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
329 | +c3a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
330 | diff --git a/f4a b/f4e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
331 | rename from f4a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
332 | rename to f4e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
333 | diff --git a/f5a b/f5b
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
334 | rename from f5a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
335 | rename to f5b
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
336 |
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
337 | o changeset: 10:93ee502e8b0a
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
338 | | user: test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
339 | | date: Thu Jan 01 00:00:00 1970 +0000
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
340 | | files: f3d f4e
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
341 | | description:
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
342 | | D2
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
343 | |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
344 | |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
345 | | diff --git a/f3d b/f3d
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
346 | | new file mode 100644
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
347 | | --- /dev/null
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
348 | | +++ b/f3d
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
349 | | @@ -0,0 +1,1 @@
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
350 | | +c3a
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
351 | | diff --git a/f4e b/f4e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
352 | | --- a/f4e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
353 | | +++ b/f4e
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
354 | | @@ -1,1 +1,1 @@
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
355 | | -c4a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
356 | | +c4d
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
357 | |
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
358 | o changeset: 9:539cf145f496
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
359 | | parent: 6:6bd1736cab86
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
360 | | user: test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
361 | | date: Thu Jan 01 00:00:00 1970 +0000
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
362 | | files: f1e f2a f2c f5a f5b
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
363 | | copies: f2c (f2a) f5a (f5b)
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
364 | | description:
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
365 | | C2
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
366 | |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
367 | |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
368 | | diff --git a/f1e b/f1e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
369 | | --- a/f1e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
370 | | +++ b/f1e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
371 | | @@ -1,1 +1,1 @@
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
372 | | -c1a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
373 | | +c1c
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
374 | | diff --git a/f2a b/f2c
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
375 | | rename from f2a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
376 | | rename to f2c
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
377 | | diff --git a/f5b b/f5a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
378 | | rename from f5b
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
379 | | rename to f5a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
380 | | --- a/f5b
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
381 | | +++ b/f5a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
382 | | @@ -1,1 +1,1 @@
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
383 | | -c5a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
384 | | +c5c
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
385 | |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
386 | | o changeset: 8:ba67f08fb15a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
387 | | | parent: 0:11f7a1b56675
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
388 | | | user: test
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
389 | | | date: Thu Jan 01 00:00:00 1970 +0000
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
390 | | | files: f1g
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
391 | | | copies: f1g (f1a)
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
392 | | | description:
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
393 | | | G0
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
394 | | |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
395 | | |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
396 | | | diff --git a/f1a b/f1g
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
397 | | | copy from f1a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
398 | | | copy to f1g
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
399 | | | --- a/f1a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
400 | | | +++ b/f1g
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
401 | | | @@ -1,1 +1,1 @@
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
402 | | | -c1a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
403 | | | +c1g
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
404 | | |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
405 | | | o changeset: 7:d376ab0d7fda
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
406 | | |/ parent: 0:11f7a1b56675
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
407 | | | user: test
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
408 | | | date: Thu Jan 01 00:00:00 1970 +0000
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
409 | | | files: f1f
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
410 | | | copies: f1f (f1a)
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
411 | | | description:
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
412 | | | F0
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
413 | | |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
414 | | |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
415 | | | diff --git a/f1a b/f1f
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
416 | | | copy from f1a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
417 | | | copy to f1f
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
418 | | |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
419 | o | changeset: 6:6bd1736cab86
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
420 | |/ parent: 0:11f7a1b56675
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
421 | | user: test
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
422 | | date: Thu Jan 01 00:00:00 1970 +0000
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
423 | | files: f1a f1e f2a f3a f3e f4a f4e f5a f5b
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
424 | | copies: f1e (f1a) f3e (f3a) f4e (f4a) f5b (f5a)
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
425 | | description:
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
426 | | E0
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
427 | |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
428 | |
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
429 | | diff --git a/f1a b/f1e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
430 | | rename from f1a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
431 | | rename to f1e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
432 | | diff --git a/f2a b/f2a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
433 | | --- a/f2a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
434 | | +++ b/f2a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
435 | | @@ -1,1 +1,1 @@
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
436 | | -c2a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
437 | | +c2e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
438 | | diff --git a/f3a b/f3e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
439 | | rename from f3a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
440 | | rename to f3e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
441 | | diff --git a/f4a b/f4e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
442 | | rename from f4a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
443 | | rename to f4e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
444 | | diff --git a/f5a b/f5b
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
445 | | rename from f5a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
446 | | rename to f5b
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
447 | |
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
448 | | o changeset: 5:560daee679da
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
449 | | | user: test
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
450 | | | date: Thu Jan 01 00:00:00 1970 +0000
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
451 | | | files: f3d f4a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
452 | | | description:
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
453 | | | D1
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
454 | | |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
455 | | |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
456 | | | diff --git a/f3d b/f3d
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
457 | | | new file mode 100644
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
458 | | | --- /dev/null
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
459 | | | +++ b/f3d
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
460 | | | @@ -0,0 +1,1 @@
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
461 | | | +c3a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
462 | | | diff --git a/f4a b/f4a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
463 | | | --- a/f4a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
464 | | | +++ b/f4a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
465 | | | @@ -1,1 +1,1 @@
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
466 | | | -c4a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
467 | | | +c4d
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
468 | | |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
469 | | o changeset: 4:c9763722f9bd
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
470 | |/ parent: 0:11f7a1b56675
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
471 | | user: test
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
472 | | date: Thu Jan 01 00:00:00 1970 +0000
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
473 | | files: f1a f2a f2c f5a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
474 | | copies: f2c (f2a)
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
475 | | description:
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
476 | | C1
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
477 | |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
478 | |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
479 | | diff --git a/f1a b/f1a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
480 | | --- a/f1a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
481 | | +++ b/f1a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
482 | | @@ -1,1 +1,1 @@
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
483 | | -c1a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
484 | | +c1c
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
485 | | diff --git a/f2a b/f2c
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
486 | | rename from f2a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
487 | | rename to f2c
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
488 | | diff --git a/f5a b/f5a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
489 | | --- a/f5a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
490 | | +++ b/f5a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
491 | | @@ -1,1 +1,1 @@
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
492 | | -c5a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
493 | | +c5c
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
494 | |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
495 +---o changeset: 3:b69f5839d2d9
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
496 | | user: test
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
497 | | date: Thu Jan 01 00:00:00 1970 +0000
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
498 | | files: f3b f3d f4a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
499 | | copies: f3d (f3b)
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
500 | | description:
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
501 | | D0
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
502 | |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
503 | |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
504 | | diff --git a/f3b b/f3d
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
505 | | rename from f3b
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
506 | | rename to f3d
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
507 | | diff --git a/f4a b/f4a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
508 | | --- a/f4a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
509 | | +++ b/f4a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
510 | | @@ -1,1 +1,1 @@
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
511 | | -c4a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
512 | | +c4d
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
513 | |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
514 o | changeset: 2:f58c7e2b28fa
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
515 | | user: test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
516 | | date: Thu Jan 01 00:00:00 1970 +0000
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
517 | | files: f1b f2a f2c f5a f5b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
518 | | copies: f2c (f2a) f5a (f5b)
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
519 | | description:
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
520 | | C0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
521 | |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
522 | |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
523 | | diff --git a/f1b b/f1b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
524 | | --- a/f1b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
525 | | +++ b/f1b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
526 | | @@ -1,1 +1,1 @@
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
527 | | -c1a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
528 | | +c1c
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
529 | | diff --git a/f2a b/f2c
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
530 | | rename from f2a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
531 | | rename to f2c
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
532 | | diff --git a/f5b b/f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
533 | | rename from f5b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
534 | | rename to f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
535 | | --- a/f5b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
536 | | +++ b/f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
537 | | @@ -1,1 +1,1 @@
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
538 | | -c5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
539 | | +c5c
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
540 | |
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
541 o | changeset: 1:3d7bba921b5d
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
542 |/ user: test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
543 | date: Thu Jan 01 00:00:00 1970 +0000
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
544 | files: f1a f1b f3a f3b f5a f5b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
545 | copies: f1b (f1a) f3b (f3a) f5b (f5a)
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
546 | description:
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
547 | B0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
548 |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
549 |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
550 | diff --git a/f1a b/f1b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
551 | rename from f1a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
552 | rename to f1b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
553 | diff --git a/f3a b/f3b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
554 | rename from f3a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
555 | rename to f3b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
556 | diff --git a/f5a b/f5b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
557 | rename from f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
558 | rename to f5b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
559 |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
560 o changeset: 0:11f7a1b56675
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
561 user: test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
562 date: Thu Jan 01 00:00:00 1970 +0000
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
563 files: f1a f2a f3a f4a f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
564 description:
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
565 A0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
566
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
567
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
568 diff --git a/f1a b/f1a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
569 new file mode 100644
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
570 --- /dev/null
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
571 +++ b/f1a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
572 @@ -0,0 +1,1 @@
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
573 +c1a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
574 diff --git a/f2a b/f2a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
575 new file mode 100644
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
576 --- /dev/null
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
577 +++ b/f2a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
578 @@ -0,0 +1,1 @@
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
579 +c2a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
580 diff --git a/f3a b/f3a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
581 new file mode 100644
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
582 --- /dev/null
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
583 +++ b/f3a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
584 @@ -0,0 +1,1 @@
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
585 +c3a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
586 diff --git a/f4a b/f4a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
587 new file mode 100644
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
588 --- /dev/null
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
589 +++ b/f4a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
590 @@ -0,0 +1,1 @@
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
591 +c4a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
592 diff --git a/f5a b/f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
593 new file mode 100644
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
594 --- /dev/null
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
595 +++ b/f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
596 @@ -0,0 +1,1 @@
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
597 +c5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
598
30229
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30204
diff changeset
599 Check superfluous filemerge of files renamed in the past but untouched by graft
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30204
diff changeset
600
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30204
diff changeset
601 $ echo a > a
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30204
diff changeset
602 $ hg ci -qAma
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30204
diff changeset
603 $ hg mv a b
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30204
diff changeset
604 $ echo b > b
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30204
diff changeset
605 $ hg ci -qAmb
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30204
diff changeset
606 $ echo c > c
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30204
diff changeset
607 $ hg ci -qAmc
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30204
diff changeset
608 $ hg up -q .~2
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30204
diff changeset
609 $ hg graft tip -qt:fail
30581
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
610
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
611 $ cd ..
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
612
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
613 Graft a change into a new file previously grafted into a renamed directory
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
614
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
615 $ hg init dirmovenewfile
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
616 $ cd dirmovenewfile
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
617 $ mkdir a
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
618 $ echo a > a/a
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
619 $ hg ci -qAma
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
620 $ echo x > a/x
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
621 $ hg ci -qAmx
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
622 $ hg up -q 0
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
623 $ hg mv -q a b
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
624 $ hg ci -qAmb
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
625 $ hg graft -q 1 # a/x grafted as b/x, but no copy information recorded
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
626 $ hg up -q 1
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
627 $ echo y > a/x
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
628 $ hg ci -qAmy
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
629 $ hg up -q 3
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
630 $ hg graft -q 4
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
631 $ hg status --change .
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
632 M b/x
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
633
32204
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
634 Prepare for test of skipped changesets and how merges can influence it:
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
635
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
636 $ hg merge -q -r 1 --tool :local
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
637 $ hg ci -m m
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
638 $ echo xx >> b/x
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
639 $ hg ci -m xx
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
640
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
641 $ hg log -G -T '{rev} {desc|firstline}'
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
642 @ 7 xx
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
643 |
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
644 o 6 m
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
645 |\
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
646 | o 5 y
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
647 | |
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
648 +---o 4 y
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
649 | |
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
650 | o 3 x
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
651 | |
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
652 | o 2 b
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
653 | |
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
654 o | 1 x
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
655 |/
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
656 o 0 a
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
657
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
658 Grafting of plain changes correctly detects that 3 and 5 should be skipped:
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
659
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
660 $ hg up -qCr 4
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
661 $ hg graft --tool :local -r 2::5
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
662 skipping already grafted revision 3:ca093ca2f1d9 (was grafted from 1:13ec5badbf2a)
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
663 skipping already grafted revision 5:43e9eb70dab0 (was grafted from 4:6c9a1289e5f1)
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
664 grafting 2:42127f193bcd "b"
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
665
32205
b4e1e30528c7 graft: fix graft across merges of duplicates of grafted changes
Mads Kiilerich <madski@unity3d.com>
parents: 32204
diff changeset
666 Extending the graft range to include a (skipped) merge of 3 will not prevent us from
b4e1e30528c7 graft: fix graft across merges of duplicates of grafted changes
Mads Kiilerich <madski@unity3d.com>
parents: 32204
diff changeset
667 also detecting that both 3 and 5 should be skipped:
32204
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
668
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
669 $ hg up -qCr 4
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
670 $ hg graft --tool :local -r 2::7
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
671 skipping ungraftable merge revision 6
32205
b4e1e30528c7 graft: fix graft across merges of duplicates of grafted changes
Mads Kiilerich <madski@unity3d.com>
parents: 32204
diff changeset
672 skipping already grafted revision 3:ca093ca2f1d9 (was grafted from 1:13ec5badbf2a)
32204
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
673 skipping already grafted revision 5:43e9eb70dab0 (was grafted from 4:6c9a1289e5f1)
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
674 grafting 2:42127f193bcd "b"
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
675 grafting 7:d3c3f2b38ecc "xx"
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
676 note: graft of 7:d3c3f2b38ecc created no changes to commit
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
677
30581
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
678 $ cd ..
38149
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
679
40656
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
680 Grafted revision should be warned and skipped only once. (issue6024)
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
681
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
682 $ mkdir issue6024
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
683 $ cd issue6024
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
684
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
685 $ hg init base
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
686 $ cd base
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
687 $ touch x
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
688 $ hg commit -qAminit
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
689 $ echo a > x
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
690 $ hg commit -mchange
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
691 $ hg update -q 0
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
692 $ hg graft -r 1
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
693 grafting 1:a0b923c546aa "change" (tip)
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
694 $ cd ..
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
695
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
696 $ hg clone -qr 2 base clone
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
697 $ cd clone
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
698 $ hg pull -q
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
699 $ hg merge -q 2
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
700 $ hg commit -mmerge
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
701 $ hg update -q 0
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
702 $ hg graft -r 1
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
703 grafting 1:04fc6d444368 "change"
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
704 $ hg update -q 3
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
705 $ hg log -G -T '{rev}:{node|shortest} <- {extras.source|shortest}\n'
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
706 o 4:4e16 <- a0b9
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
707 |
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
708 | @ 3:f0ac <-
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
709 | |\
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
710 +---o 2:a0b9 <-
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
711 | |
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
712 | o 1:04fc <- a0b9
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
713 |/
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
714 o 0:7848 <-
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
715
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
716
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
717 the source of rev 4 is an ancestor of the working parent, and was also
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
718 grafted as rev 1. it should be stripped from the target revisions only once.
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
719
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
720 $ hg graft -r 4
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
721 skipping already grafted revision 4:4e16bab40c9c (1:04fc6d444368 also has origin 2:a0b923c546aa)
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
722 [255]
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
723
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
724 $ cd ../..