Mercurial > hg
annotate tests/test-mv-cp-st-diff.out @ 6543:a6e2e60b34d0
convert: handle past or foreign partial svn copies
Subversion allows revisions to be composed of subparts coming from revisions
before the parent or from other part of the repository. There is no simple
representation for these now, keep the changes but do not track their origins.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Mon, 14 Apr 2008 22:31:34 +0200 |
parents | 2d9328a2f81f |
children | 3f4f14eab085 |
rev | line source |
---|---|
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6286
diff
changeset
|
1 created new head |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
2 ** rename in working dir ** |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
3 ** add a a1 / add a a2 / hg mv a b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
4 - working to parent: |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
5 A b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
6 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
7 R a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
8 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
9 diff --git a/a b/b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
10 rename from a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
11 rename to b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
12 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
13 - working to root: --rev 0 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
14 A b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
15 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
16 R a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
17 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
18 diff --git a/a b/b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
19 rename from a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
20 rename to b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
21 --- a/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
22 +++ b/b |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
23 @@ -1,1 +1,4 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
24 a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
25 +0 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
26 +a1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
27 +a2 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
28 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
29 - working to branch: --rev 2 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
30 A b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
31 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
32 R a |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
33 R x/y |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
34 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
35 diff --git a/a b/b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
36 rename from a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
37 rename to b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
38 --- a/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
39 +++ b/b |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
40 @@ -1,3 +1,4 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
41 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
42 -m1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
43 -m2 |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
44 +0 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
45 +a1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
46 +a2 |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
47 diff --git a/x/y b/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
48 deleted file mode 100644 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
49 --- a/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
50 +++ /dev/null |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
51 @@ -1,1 +0,0 @@ |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
52 -y1 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
53 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
54 - root to parent: --rev 0 --rev . |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
55 M a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
56 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
57 diff --git a/a b/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
58 --- a/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
59 +++ b/a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
60 @@ -1,1 +1,4 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
61 a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
62 +0 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
63 +a1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
64 +a2 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
65 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
66 - parent to root: --rev . --rev 0 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
67 M a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
68 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
69 diff --git a/a b/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
70 --- a/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
71 +++ b/a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
72 @@ -1,4 +1,1 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
73 a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
74 -0 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
75 -a1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
76 -a2 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
77 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
78 - branch to parent: --rev 2 --rev . |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
79 M a |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
80 R x/y |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
81 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
82 diff --git a/a b/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
83 --- a/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
84 +++ b/a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
85 @@ -1,3 +1,4 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
86 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
87 -m1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
88 -m2 |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
89 +0 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
90 +a1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
91 +a2 |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
92 diff --git a/x/y b/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
93 deleted file mode 100644 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
94 --- a/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
95 +++ /dev/null |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
96 @@ -1,1 +0,0 @@ |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
97 -y1 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
98 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
99 - parent to branch: --rev . --rev 2 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
100 M a |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
101 A x/y |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
102 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
103 diff --git a/a b/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
104 --- a/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
105 +++ b/a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
106 @@ -1,4 +1,3 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
107 a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
108 -0 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
109 -a1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
110 -a2 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
111 +m1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
112 +m2 |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
113 diff --git a/x/y b/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
114 new file mode 100644 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
115 --- /dev/null |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
116 +++ b/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
117 @@ -0,0 +1,1 @@ |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
118 +y1 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
119 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
120 |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6286
diff
changeset
|
121 created new head |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
122 ** copy in working dir ** |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
123 ** add a a1 / add a a2 / hg cp a b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
124 - working to parent: |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
125 A b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
126 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
127 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
128 diff --git a/a b/b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
129 copy from a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
130 copy to b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
131 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
132 - working to root: --rev 0 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
133 M a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
134 A b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
135 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
136 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
137 diff --git a/a b/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
138 --- a/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
139 +++ b/a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
140 @@ -1,1 +1,4 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
141 a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
142 +1 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
143 +a1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
144 +a2 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
145 diff --git a/a b/b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
146 copy from a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
147 copy to b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
148 --- a/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
149 +++ b/b |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
150 @@ -1,1 +1,4 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
151 a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
152 +1 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
153 +a1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
154 +a2 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
155 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
156 - working to branch: --rev 2 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
157 M a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
158 A b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
159 a |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
160 R x/y |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
161 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
162 diff --git a/a b/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
163 --- a/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
164 +++ b/a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
165 @@ -1,3 +1,4 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
166 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
167 -m1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
168 -m2 |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
169 +1 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
170 +a1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
171 +a2 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
172 diff --git a/a b/b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
173 copy from a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
174 copy to b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
175 --- a/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
176 +++ b/b |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
177 @@ -1,3 +1,4 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
178 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
179 -m1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
180 -m2 |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
181 +1 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
182 +a1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
183 +a2 |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
184 diff --git a/x/y b/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
185 deleted file mode 100644 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
186 --- a/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
187 +++ /dev/null |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
188 @@ -1,1 +0,0 @@ |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
189 -y1 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
190 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
191 - root to parent: --rev 0 --rev . |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
192 M a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
193 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
194 diff --git a/a b/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
195 --- a/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
196 +++ b/a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
197 @@ -1,1 +1,4 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
198 a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
199 +1 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
200 +a1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
201 +a2 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
202 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
203 - parent to root: --rev . --rev 0 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
204 M a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
205 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
206 diff --git a/a b/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
207 --- a/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
208 +++ b/a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
209 @@ -1,4 +1,1 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
210 a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
211 -1 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
212 -a1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
213 -a2 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
214 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
215 - branch to parent: --rev 2 --rev . |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
216 M a |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
217 R x/y |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
218 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
219 diff --git a/a b/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
220 --- a/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
221 +++ b/a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
222 @@ -1,3 +1,4 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
223 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
224 -m1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
225 -m2 |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
226 +1 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
227 +a1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
228 +a2 |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
229 diff --git a/x/y b/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
230 deleted file mode 100644 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
231 --- a/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
232 +++ /dev/null |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
233 @@ -1,1 +0,0 @@ |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
234 -y1 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
235 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
236 - parent to branch: --rev . --rev 2 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
237 M a |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
238 A x/y |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
239 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
240 diff --git a/a b/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
241 --- a/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
242 +++ b/a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
243 @@ -1,4 +1,3 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
244 a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
245 -1 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
246 -a1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
247 -a2 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
248 +m1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
249 +m2 |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
250 diff --git a/x/y b/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
251 new file mode 100644 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
252 --- /dev/null |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
253 +++ b/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
254 @@ -0,0 +1,1 @@ |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
255 +y1 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
256 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
257 |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6286
diff
changeset
|
258 created new head |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
259 ** single rename ** |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
260 ** hg mv a b / add b b1 / add b w |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
261 - working to parent: |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
262 M b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
263 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
264 diff --git a/b b/b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
265 --- a/b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
266 +++ b/b |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
267 @@ -1,3 +1,4 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
268 a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
269 2 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
270 b1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
271 +w |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
272 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
273 - working to root: --rev 0 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
274 A b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
275 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
276 R a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
277 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
278 diff --git a/a b/b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
279 rename from a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
280 rename to b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
281 --- a/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
282 +++ b/b |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
283 @@ -1,1 +1,4 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
284 a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
285 +2 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
286 +b1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
287 +w |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
288 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
289 - working to branch: --rev 2 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
290 A b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
291 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
292 R a |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
293 R x/y |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
294 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
295 diff --git a/a b/b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
296 rename from a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
297 rename to b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
298 --- a/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
299 +++ b/b |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
300 @@ -1,3 +1,4 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
301 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
302 -m1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
303 -m2 |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
304 +2 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
305 +b1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
306 +w |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
307 diff --git a/x/y b/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
308 deleted file mode 100644 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
309 --- a/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
310 +++ /dev/null |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
311 @@ -1,1 +0,0 @@ |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
312 -y1 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
313 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
314 - root to parent: --rev 0 --rev . |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
315 A b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
316 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
317 R a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
318 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
319 diff --git a/a b/b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
320 rename from a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
321 rename to b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
322 --- a/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
323 +++ b/b |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
324 @@ -1,1 +1,3 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
325 a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
326 +2 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
327 +b1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
328 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
329 - parent to root: --rev . --rev 0 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
330 A a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
331 b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
332 R b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
333 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
334 diff --git a/b b/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
335 rename from b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
336 rename to a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
337 --- a/b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
338 +++ b/a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
339 @@ -1,3 +1,1 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
340 a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
341 -2 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
342 -b1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
343 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
344 - branch to parent: --rev 2 --rev . |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
345 A b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
346 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
347 R a |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
348 R x/y |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
349 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
350 diff --git a/a b/b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
351 rename from a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
352 rename to b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
353 --- a/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
354 +++ b/b |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
355 @@ -1,3 +1,3 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
356 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
357 -m1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
358 -m2 |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
359 +2 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
360 +b1 |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
361 diff --git a/x/y b/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
362 deleted file mode 100644 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
363 --- a/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
364 +++ /dev/null |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
365 @@ -1,1 +0,0 @@ |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
366 -y1 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
367 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
368 - parent to branch: --rev . --rev 2 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
369 A a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
370 b |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
371 A x/y |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
372 R b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
373 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
374 diff --git a/b b/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
375 rename from b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
376 rename to a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
377 --- a/b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
378 +++ b/a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
379 @@ -1,3 +1,3 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
380 a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
381 -2 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
382 -b1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
383 +m1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
384 +m2 |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
385 diff --git a/x/y b/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
386 new file mode 100644 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
387 --- /dev/null |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
388 +++ b/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
389 @@ -0,0 +1,1 @@ |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
390 +y1 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
391 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
392 |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6286
diff
changeset
|
393 created new head |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
394 ** single copy ** |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
395 ** hg cp a b / add b b1 / add a w |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
396 - working to parent: |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
397 M a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
398 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
399 diff --git a/a b/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
400 --- a/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
401 +++ b/a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
402 @@ -1,2 +1,3 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
403 a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
404 3 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
405 +w |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
406 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
407 - working to root: --rev 0 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
408 M a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
409 A b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
410 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
411 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
412 diff --git a/a b/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
413 --- a/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
414 +++ b/a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
415 @@ -1,1 +1,3 @@ |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
416 a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
417 +3 |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
418 +w |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
419 diff --git a/a b/b |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
420 copy from a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
421 copy to b |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
422 --- a/a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
423 +++ b/b |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
424 @@ -1,1 +1,3 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
425 a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
426 +3 |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
427 +b1 |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
428 |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
429 - working to branch: --rev 2 |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
430 M a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
431 A b |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
432 a |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
433 R x/y |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
434 |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
435 diff --git a/a b/a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
436 --- a/a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
437 +++ b/a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
438 @@ -1,3 +1,3 @@ |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
439 a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
440 -m1 |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
441 -m2 |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
442 +3 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
443 +w |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
444 diff --git a/a b/b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
445 copy from a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
446 copy to b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
447 --- a/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
448 +++ b/b |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
449 @@ -1,3 +1,3 @@ |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
450 a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
451 -m1 |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
452 -m2 |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
453 +3 |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
454 +b1 |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
455 diff --git a/x/y b/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
456 deleted file mode 100644 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
457 --- a/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
458 +++ /dev/null |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
459 @@ -1,1 +0,0 @@ |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
460 -y1 |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
461 |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
462 - root to parent: --rev 0 --rev . |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
463 M a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
464 A b |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
465 a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
466 |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
467 diff --git a/a b/a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
468 --- a/a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
469 +++ b/a |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
470 @@ -1,1 +1,2 @@ |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
471 a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
472 +3 |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
473 diff --git a/a b/b |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
474 copy from a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
475 copy to b |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
476 --- a/a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
477 +++ b/b |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
478 @@ -1,1 +1,3 @@ |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
479 a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
480 +3 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
481 +b1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
482 |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
483 - parent to root: --rev . --rev 0 |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
484 M a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
485 R b |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
486 |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
487 diff --git a/a b/a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
488 --- a/a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
489 +++ b/a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
490 @@ -1,2 +1,1 @@ |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
491 a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
492 -3 |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
493 diff --git a/b b/b |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
494 deleted file mode 100644 |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
495 --- a/b |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
496 +++ /dev/null |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
497 @@ -1,3 +0,0 @@ |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
498 -a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
499 -3 |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
500 -b1 |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
501 |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
502 - branch to parent: --rev 2 --rev . |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
503 M a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
504 A b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
505 a |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
506 R x/y |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
507 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
508 diff --git a/a b/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
509 --- a/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
510 +++ b/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
511 @@ -1,3 +1,2 @@ |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
512 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
513 -m1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
514 -m2 |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
515 +3 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
516 diff --git a/a b/b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
517 copy from a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
518 copy to b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
519 --- a/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
520 +++ b/b |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
521 @@ -1,3 +1,3 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
522 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
523 -m1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
524 -m2 |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
525 +3 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
526 +b1 |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
527 diff --git a/x/y b/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
528 deleted file mode 100644 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
529 --- a/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
530 +++ /dev/null |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
531 @@ -1,1 +0,0 @@ |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
532 -y1 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
533 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
534 - parent to branch: --rev . --rev 2 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
535 M a |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
536 A x/y |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
537 R b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
538 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
539 diff --git a/a b/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
540 --- a/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
541 +++ b/a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
542 @@ -1,2 +1,3 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
543 a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
544 -3 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
545 +m1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
546 +m2 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
547 diff --git a/b b/b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
548 deleted file mode 100644 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
549 --- a/b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
550 +++ /dev/null |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
551 @@ -1,3 +0,0 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
552 -a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
553 -3 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
554 -b1 |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
555 diff --git a/x/y b/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
556 new file mode 100644 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
557 --- /dev/null |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
558 +++ b/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
559 @@ -0,0 +1,1 @@ |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
560 +y1 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
561 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
562 |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6286
diff
changeset
|
563 created new head |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
564 ** rename chain ** |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
565 ** hg mv a b / hg mv b c / hg mv c d |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
566 - working to parent: |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
567 A d |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
568 c |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
569 R c |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
570 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
571 diff --git a/c b/d |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
572 rename from c |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
573 rename to d |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
574 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
575 - working to root: --rev 0 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
576 A d |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
577 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
578 R a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
579 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
580 diff --git a/a b/d |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
581 rename from a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
582 rename to d |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
583 --- a/a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
584 +++ b/d |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
585 @@ -1,1 +1,2 @@ |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
586 a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
587 +4 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
588 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
589 - working to branch: --rev 2 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
590 A d |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
591 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
592 R a |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
593 R x/y |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
594 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
595 diff --git a/a b/d |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
596 rename from a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
597 rename to d |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
598 --- a/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
599 +++ b/d |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
600 @@ -1,3 +1,2 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
601 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
602 -m1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
603 -m2 |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
604 +4 |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
605 diff --git a/x/y b/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
606 deleted file mode 100644 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
607 --- a/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
608 +++ /dev/null |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
609 @@ -1,1 +0,0 @@ |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
610 -y1 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
611 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
612 - root to parent: --rev 0 --rev . |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
613 A c |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
614 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
615 R a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
616 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
617 diff --git a/a b/c |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
618 rename from a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
619 rename to c |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
620 --- a/a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
621 +++ b/c |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
622 @@ -1,1 +1,2 @@ |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
623 a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
624 +4 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
625 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
626 - parent to root: --rev . --rev 0 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
627 A a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
628 c |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
629 R c |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
630 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
631 diff --git a/c b/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
632 rename from c |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
633 rename to a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
634 --- a/c |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
635 +++ b/a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
636 @@ -1,2 +1,1 @@ |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
637 a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
638 -4 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
639 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
640 - branch to parent: --rev 2 --rev . |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
641 A c |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
642 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
643 R a |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
644 R x/y |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
645 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
646 diff --git a/a b/c |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
647 rename from a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
648 rename to c |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
649 --- a/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
650 +++ b/c |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
651 @@ -1,3 +1,2 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
652 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
653 -m1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
654 -m2 |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
655 +4 |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
656 diff --git a/x/y b/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
657 deleted file mode 100644 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
658 --- a/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
659 +++ /dev/null |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
660 @@ -1,1 +0,0 @@ |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
661 -y1 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
662 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
663 - parent to branch: --rev . --rev 2 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
664 A a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
665 c |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
666 A x/y |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
667 R c |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
668 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
669 diff --git a/c b/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
670 rename from c |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
671 rename to a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
672 --- a/c |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
673 +++ b/a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
674 @@ -1,2 +1,3 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
675 a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
676 -4 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
677 +m1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
678 +m2 |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
679 diff --git a/x/y b/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
680 new file mode 100644 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
681 --- /dev/null |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
682 +++ b/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
683 @@ -0,0 +1,1 @@ |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
684 +y1 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
685 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
686 |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6286
diff
changeset
|
687 created new head |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
688 ** copy chain ** |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
689 ** hg cp a b / hg cp b c / hg cp c d |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
690 - working to parent: |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
691 A d |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
692 c |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
693 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
694 diff --git a/c b/d |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
695 copy from c |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
696 copy to d |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
697 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
698 - working to root: --rev 0 |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
699 M a |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
700 A b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
701 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
702 A c |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
703 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
704 A d |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
705 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
706 |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
707 diff --git a/a b/a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
708 --- a/a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
709 +++ b/a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
710 @@ -1,1 +1,2 @@ |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
711 a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
712 +5 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
713 diff --git a/a b/b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
714 copy from a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
715 copy to b |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
716 --- a/a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
717 +++ b/b |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
718 @@ -1,1 +1,2 @@ |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
719 a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
720 +5 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
721 diff --git a/a b/c |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
722 copy from a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
723 copy to c |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
724 --- a/a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
725 +++ b/c |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
726 @@ -1,1 +1,2 @@ |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
727 a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
728 +5 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
729 diff --git a/a b/d |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
730 copy from a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
731 copy to d |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
732 --- a/a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
733 +++ b/d |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
734 @@ -1,1 +1,2 @@ |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
735 a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
736 +5 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
737 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
738 - working to branch: --rev 2 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
739 M a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
740 A b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
741 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
742 A c |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
743 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
744 A d |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
745 a |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
746 R x/y |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
747 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
748 diff --git a/a b/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
749 --- a/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
750 +++ b/a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
751 @@ -1,3 +1,2 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
752 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
753 -m1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
754 -m2 |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
755 +5 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
756 diff --git a/a b/b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
757 copy from a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
758 copy to b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
759 --- a/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
760 +++ b/b |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
761 @@ -1,3 +1,2 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
762 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
763 -m1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
764 -m2 |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
765 +5 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
766 diff --git a/a b/c |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
767 copy from a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
768 copy to c |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
769 --- a/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
770 +++ b/c |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
771 @@ -1,3 +1,2 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
772 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
773 -m1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
774 -m2 |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
775 +5 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
776 diff --git a/a b/d |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
777 copy from a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
778 copy to d |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
779 --- a/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
780 +++ b/d |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
781 @@ -1,3 +1,2 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
782 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
783 -m1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
784 -m2 |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
785 +5 |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
786 diff --git a/x/y b/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
787 deleted file mode 100644 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
788 --- a/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
789 +++ /dev/null |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
790 @@ -1,1 +0,0 @@ |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
791 -y1 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
792 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
793 - root to parent: --rev 0 --rev . |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
794 M a |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
795 A b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
796 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
797 A c |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
798 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
799 |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
800 diff --git a/a b/a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
801 --- a/a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
802 +++ b/a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
803 @@ -1,1 +1,2 @@ |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
804 a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
805 +5 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
806 diff --git a/a b/b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
807 copy from a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
808 copy to b |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
809 --- a/a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
810 +++ b/b |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
811 @@ -1,1 +1,2 @@ |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
812 a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
813 +5 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
814 diff --git a/a b/c |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
815 copy from a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
816 copy to c |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
817 --- a/a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
818 +++ b/c |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
819 @@ -1,1 +1,2 @@ |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
820 a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
821 +5 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
822 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
823 - parent to root: --rev . --rev 0 |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
824 M a |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
825 R b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
826 R c |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
827 |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
828 diff --git a/a b/a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
829 --- a/a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
830 +++ b/a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
831 @@ -1,2 +1,1 @@ |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
832 a |
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
833 -5 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
834 diff --git a/b b/b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
835 deleted file mode 100644 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
836 --- a/b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
837 +++ /dev/null |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
838 @@ -1,2 +0,0 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
839 -a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
840 -5 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
841 diff --git a/c b/c |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
842 deleted file mode 100644 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
843 --- a/c |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
844 +++ /dev/null |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
845 @@ -1,2 +0,0 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
846 -a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
847 -5 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
848 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
849 - branch to parent: --rev 2 --rev . |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
850 M a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
851 A b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
852 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
853 A c |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
854 a |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
855 R x/y |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
856 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
857 diff --git a/a b/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
858 --- a/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
859 +++ b/a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
860 @@ -1,3 +1,2 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
861 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
862 -m1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
863 -m2 |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
864 +5 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
865 diff --git a/a b/b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
866 copy from a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
867 copy to b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
868 --- a/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
869 +++ b/b |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
870 @@ -1,3 +1,2 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
871 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
872 -m1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
873 -m2 |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
874 +5 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
875 diff --git a/a b/c |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
876 copy from a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
877 copy to c |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
878 --- a/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
879 +++ b/c |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
880 @@ -1,3 +1,2 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
881 a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
882 -m1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
883 -m2 |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
884 +5 |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
885 diff --git a/x/y b/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
886 deleted file mode 100644 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
887 --- a/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
888 +++ /dev/null |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
889 @@ -1,1 +0,0 @@ |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
890 -y1 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
891 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
892 - parent to branch: --rev . --rev 2 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
893 M a |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
894 A x/y |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
895 R b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
896 R c |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
897 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
898 diff --git a/a b/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
899 --- a/a |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
900 +++ b/a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
901 @@ -1,2 +1,3 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
902 a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
903 -5 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
904 +m1 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
905 +m2 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
906 diff --git a/b b/b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
907 deleted file mode 100644 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
908 --- a/b |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
909 +++ /dev/null |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
910 @@ -1,2 +0,0 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
911 -a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
912 -5 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
913 diff --git a/c b/c |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
914 deleted file mode 100644 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
915 --- a/c |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
916 +++ /dev/null |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
917 @@ -1,2 +0,0 @@ |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
918 -a |
6282
709652cd7bff
test-mv-cp-st-diff: avoid linkrev collisions
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6278
diff
changeset
|
919 -5 |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
920 diff --git a/x/y b/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
921 new file mode 100644 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
922 --- /dev/null |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
923 +++ b/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
924 @@ -0,0 +1,1 @@ |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
925 +y1 |
6278
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
926 |
81e7112b07ae
copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
927 |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6286
diff
changeset
|
928 created new head |
6286
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
929 ** circular rename ** |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
930 ** add a a1 / hg mv a b / hg mv b a |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
931 - working to parent: |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
932 A a |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
933 b |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
934 R b |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
935 |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
936 diff --git a/b b/a |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
937 rename from b |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
938 rename to a |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
939 |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
940 - working to root: --rev 0 |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
941 M a |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
942 |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
943 diff --git a/a b/a |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
944 --- a/a |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
945 +++ b/a |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
946 @@ -1,1 +1,3 @@ |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
947 a |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
948 +6 |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
949 +a1 |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
950 |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
951 - working to branch: --rev 2 |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
952 M a |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
953 R x/y |
6286
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
954 |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
955 diff --git a/a b/a |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
956 --- a/a |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
957 +++ b/a |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
958 @@ -1,3 +1,3 @@ |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
959 a |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
960 -m1 |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
961 -m2 |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
962 +6 |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
963 +a1 |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
964 diff --git a/x/y b/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
965 deleted file mode 100644 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
966 --- a/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
967 +++ /dev/null |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
968 @@ -1,1 +0,0 @@ |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
969 -y1 |
6286
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
970 |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
971 - root to parent: --rev 0 --rev . |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
972 A b |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
973 a |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
974 R a |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
975 |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
976 diff --git a/a b/b |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
977 rename from a |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
978 rename to b |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
979 --- a/a |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
980 +++ b/b |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
981 @@ -1,1 +1,3 @@ |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
982 a |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
983 +6 |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
984 +a1 |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
985 |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
986 - parent to root: --rev . --rev 0 |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
987 A a |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
988 b |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
989 R b |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
990 |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
991 diff --git a/b b/a |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
992 rename from b |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
993 rename to a |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
994 --- a/b |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
995 +++ b/a |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
996 @@ -1,3 +1,1 @@ |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
997 a |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
998 -6 |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
999 -a1 |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
1000 |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
1001 - branch to parent: --rev 2 --rev . |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
1002 A b |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
1003 a |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
1004 R a |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1005 R x/y |
6286
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
1006 |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
1007 diff --git a/a b/b |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
1008 rename from a |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
1009 rename to b |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
1010 --- a/a |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
1011 +++ b/b |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
1012 @@ -1,3 +1,3 @@ |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
1013 a |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
1014 -m1 |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
1015 -m2 |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
1016 +6 |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
1017 +a1 |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1018 diff --git a/x/y b/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1019 deleted file mode 100644 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1020 --- a/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1021 +++ /dev/null |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1022 @@ -1,1 +0,0 @@ |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1023 -y1 |
6286
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
1024 |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
1025 - parent to branch: --rev . --rev 2 |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
1026 A a |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
1027 b |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1028 A x/y |
6286
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
1029 R b |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
1030 |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
1031 diff --git a/b b/a |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
1032 rename from b |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
1033 rename to a |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
1034 --- a/b |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
1035 +++ b/a |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
1036 @@ -1,3 +1,3 @@ |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
1037 a |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
1038 -6 |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
1039 -a1 |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
1040 +m1 |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
1041 +m2 |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1042 diff --git a/x/y b/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1043 new file mode 100644 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1044 --- /dev/null |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1045 +++ b/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1046 @@ -0,0 +1,1 @@ |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1047 +y1 |
6286
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
1048 |
90a4329a6b4a
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6282
diff
changeset
|
1049 |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1050 created new head |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1051 moving x/x to y/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1052 ** directory move ** |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1053 ** hg mv x y / add y/x x1 / add y/x x2 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1054 - working to parent: |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1055 M y/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1056 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1057 diff --git a/y/x b/y/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1058 --- a/y/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1059 +++ b/y/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1060 @@ -1,2 +1,3 @@ |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1061 x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1062 x1 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1063 +x2 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1064 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1065 - working to root: --rev 0 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1066 M a |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1067 A y/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1068 x/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1069 R x/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1070 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1071 diff --git a/a b/a |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1072 --- a/a |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1073 +++ b/a |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1074 @@ -1,1 +1,2 @@ |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1075 a |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1076 +7 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1077 diff --git a/x/x b/y/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1078 rename from x/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1079 rename to y/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1080 --- a/x/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1081 +++ b/y/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1082 @@ -1,1 +1,3 @@ |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1083 x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1084 +x1 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1085 +x2 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1086 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1087 - working to branch: --rev 2 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1088 M a |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1089 A y/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1090 x/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1091 R x/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1092 R x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1093 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1094 diff --git a/a b/a |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1095 --- a/a |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1096 +++ b/a |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1097 @@ -1,3 +1,2 @@ |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1098 a |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1099 -m1 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1100 -m2 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1101 +7 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1102 diff --git a/x/y b/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1103 deleted file mode 100644 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1104 --- a/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1105 +++ /dev/null |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1106 @@ -1,1 +0,0 @@ |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1107 -y1 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1108 diff --git a/x/x b/y/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1109 rename from x/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1110 rename to y/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1111 --- a/x/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1112 +++ b/y/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1113 @@ -1,1 +1,3 @@ |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1114 x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1115 +x1 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1116 +x2 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1117 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1118 - root to parent: --rev 0 --rev . |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1119 M a |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1120 A y/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1121 x/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1122 R x/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1123 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1124 diff --git a/a b/a |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1125 --- a/a |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1126 +++ b/a |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1127 @@ -1,1 +1,2 @@ |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1128 a |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1129 +7 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1130 diff --git a/x/x b/y/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1131 rename from x/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1132 rename to y/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1133 --- a/x/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1134 +++ b/y/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1135 @@ -1,1 +1,2 @@ |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1136 x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1137 +x1 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1138 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1139 - parent to root: --rev . --rev 0 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1140 M a |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1141 A x/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1142 y/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1143 R y/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1144 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1145 diff --git a/a b/a |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1146 --- a/a |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1147 +++ b/a |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1148 @@ -1,2 +1,1 @@ |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1149 a |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1150 -7 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1151 diff --git a/y/x b/x/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1152 rename from y/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1153 rename to x/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1154 --- a/y/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1155 +++ b/x/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1156 @@ -1,2 +1,1 @@ |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1157 x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1158 -x1 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1159 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1160 - branch to parent: --rev 2 --rev . |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1161 M a |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1162 A y/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1163 x/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1164 R x/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1165 R x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1166 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1167 diff --git a/a b/a |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1168 --- a/a |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1169 +++ b/a |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1170 @@ -1,3 +1,2 @@ |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1171 a |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1172 -m1 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1173 -m2 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1174 +7 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1175 diff --git a/x/y b/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1176 deleted file mode 100644 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1177 --- a/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1178 +++ /dev/null |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1179 @@ -1,1 +0,0 @@ |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1180 -y1 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1181 diff --git a/x/x b/y/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1182 rename from x/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1183 rename to y/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1184 --- a/x/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1185 +++ b/y/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1186 @@ -1,1 +1,2 @@ |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1187 x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1188 +x1 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1189 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1190 - parent to branch: --rev . --rev 2 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1191 M a |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1192 A x/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1193 y/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1194 A x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1195 R y/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1196 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1197 diff --git a/a b/a |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1198 --- a/a |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1199 +++ b/a |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1200 @@ -1,2 +1,3 @@ |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1201 a |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1202 -7 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1203 +m1 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1204 +m2 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1205 diff --git a/y/x b/x/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1206 rename from y/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1207 rename to x/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1208 --- a/y/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1209 +++ b/x/x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1210 @@ -1,2 +1,1 @@ |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1211 x |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1212 -x1 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1213 diff --git a/x/y b/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1214 new file mode 100644 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1215 --- /dev/null |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1216 +++ b/x/y |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1217 @@ -0,0 +1,1 @@ |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1218 +y1 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1219 |
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
1220 |