Mercurial > hg
annotate tests/test-rename-merge2.out @ 5805:e422305e0853
test-convert: test before() and after() conversion actions
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Fri, 04 Jan 2008 23:43:55 +0100 |
parents | 8a5d8fb59ed2 |
children | c704b03884ef |
rev | line source |
---|---|
3252 | 1 -------------- |
2 test L:up a R:nc a b W: - 1 get local a to b | |
3 -------------- | |
4 resolving manifests | |
3314 | 5 overwrite None partial False |
6 ancestor 924404dff337 local e300d1c794ec+ remote 735846fee2d7 | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
7 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
8 unmatched files in other: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
9 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
10 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
11 b -> a * |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
12 checking for directory renames |
3252 | 13 rev: versions differ -> m |
3727
0fb66912040a
merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents:
3674
diff
changeset
|
14 a: remote copied to b -> m |
5042
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
4674
diff
changeset
|
15 copying a to b |
3311
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3308
diff
changeset
|
16 merging a and b |
3314 | 17 my a@e300d1c794ec+ other b@735846fee2d7 ancestor a@924404dff337 |
3252 | 18 merging rev |
3314 | 19 my rev@e300d1c794ec+ other rev@735846fee2d7 ancestor rev@924404dff337 |
3252 | 20 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
21 (branch merge, don't forget to commit) | |
22 -------------- | |
23 M b | |
24 a | |
5764
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
25 C a |
3252 | 26 -------------- |
27 | |
28 -------------- | |
29 test L:nc a b R:up a W: - 2 get rem change to a and b | |
30 -------------- | |
31 resolving manifests | |
3314 | 32 overwrite None partial False |
33 ancestor 924404dff337 local ac809aeed39a+ remote f4db7e329e71 | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
34 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
35 unmatched files in local: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
36 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
37 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
38 b -> a * |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
39 checking for directory renames |
3252 | 40 a: remote is newer -> g |
3727
0fb66912040a
merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents:
3674
diff
changeset
|
41 b: local copied to a -> m |
3252 | 42 rev: versions differ -> m |
43 getting a | |
3311
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3308
diff
changeset
|
44 merging b and a |
3314 | 45 my b@ac809aeed39a+ other a@f4db7e329e71 ancestor a@924404dff337 |
3252 | 46 merging rev |
3314 | 47 my rev@ac809aeed39a+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
3252 | 48 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
49 (branch merge, don't forget to commit) | |
50 -------------- | |
51 M a | |
52 M b | |
3292
764688cf51e5
merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents:
3282
diff
changeset
|
53 a |
3252 | 54 -------------- |
55 | |
56 -------------- | |
57 test L:up a R:nm a b W: - 3 get local a change to b, remove a | |
58 -------------- | |
59 resolving manifests | |
3314 | 60 overwrite None partial False |
61 ancestor 924404dff337 local e300d1c794ec+ remote e03727d2d66b | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
62 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
63 unmatched files in other: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
64 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
65 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
66 b -> a * |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
67 checking for directory renames |
3730
d377f8d25662
merge: only store one direction of copies in the copy map
Matt Mackall <mpm@selenic.com>
parents:
3727
diff
changeset
|
68 rev: versions differ -> m |
3727
0fb66912040a
merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents:
3674
diff
changeset
|
69 a: remote moved to b -> m |
5042
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
4674
diff
changeset
|
70 copying a to b |
3311
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3308
diff
changeset
|
71 merging a and b |
3314 | 72 my a@e300d1c794ec+ other b@e03727d2d66b ancestor a@924404dff337 |
3252 | 73 removing a |
74 merging rev | |
3314 | 75 my rev@e300d1c794ec+ other rev@e03727d2d66b ancestor rev@924404dff337 |
3252 | 76 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
77 (branch merge, don't forget to commit) | |
78 -------------- | |
79 M b | |
80 a | |
81 -------------- | |
82 | |
83 -------------- | |
84 test L:nm a b R:up a W: - 4 get remote change to b | |
85 -------------- | |
86 resolving manifests | |
3314 | 87 overwrite None partial False |
88 ancestor 924404dff337 local ecf3cb2a4219+ remote f4db7e329e71 | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
89 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
90 unmatched files in local: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
91 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
92 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
93 b -> a * |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
94 checking for directory renames |
3727
0fb66912040a
merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents:
3674
diff
changeset
|
95 b: local moved to a -> m |
3252 | 96 rev: versions differ -> m |
3311
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3308
diff
changeset
|
97 merging b and a |
3314 | 98 my b@ecf3cb2a4219+ other a@f4db7e329e71 ancestor a@924404dff337 |
3252 | 99 merging rev |
3314 | 100 my rev@ecf3cb2a4219+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
3252 | 101 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
102 (branch merge, don't forget to commit) | |
103 -------------- | |
104 M b | |
3292
764688cf51e5
merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents:
3282
diff
changeset
|
105 a |
3252 | 106 -------------- |
107 | |
108 -------------- | |
109 test L: R:nc a b W: - 5 get b | |
110 -------------- | |
111 resolving manifests | |
3314 | 112 overwrite None partial False |
113 ancestor 924404dff337 local 94b33a1b7f2d+ remote 735846fee2d7 | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
114 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
115 unmatched files in other: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
116 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
117 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
118 b -> a |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
119 checking for directory renames |
3252 | 120 rev: versions differ -> m |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
121 b: remote created -> g |
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
122 getting b |
3252 | 123 merging rev |
3314 | 124 my rev@94b33a1b7f2d+ other rev@735846fee2d7 ancestor rev@924404dff337 |
3400
d2b55e3c4e25
merge: if filemerge skips merge, report as updated
Matt Mackall <mpm@selenic.com>
parents:
3314
diff
changeset
|
125 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
3252 | 126 (branch merge, don't forget to commit) |
127 -------------- | |
128 M b | |
5764
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
129 C a |
3252 | 130 -------------- |
131 | |
132 -------------- | |
133 test L:nc a b R: W: - 6 nothing | |
134 -------------- | |
135 resolving manifests | |
3314 | 136 overwrite None partial False |
137 ancestor 924404dff337 local ac809aeed39a+ remote 97c705ade336 | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
138 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
139 unmatched files in local: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
140 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
141 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
142 b -> a |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
143 checking for directory renames |
3252 | 144 rev: versions differ -> m |
145 merging rev | |
3314 | 146 my rev@ac809aeed39a+ other rev@97c705ade336 ancestor rev@924404dff337 |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
147 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
3252 | 148 (branch merge, don't forget to commit) |
149 -------------- | |
5764
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
150 C a |
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
151 C b |
3252 | 152 -------------- |
153 | |
154 -------------- | |
155 test L: R:nm a b W: - 7 get b | |
156 -------------- | |
157 resolving manifests | |
3314 | 158 overwrite None partial False |
159 ancestor 924404dff337 local 94b33a1b7f2d+ remote e03727d2d66b | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
160 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
161 unmatched files in other: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
162 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
163 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
164 b -> a |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
165 checking for directory renames |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
166 a: other deleted -> r |
3252 | 167 rev: versions differ -> m |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
168 b: remote created -> g |
3252 | 169 removing a |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
170 getting b |
3252 | 171 merging rev |
3314 | 172 my rev@94b33a1b7f2d+ other rev@e03727d2d66b ancestor rev@924404dff337 |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
173 1 files updated, 1 files merged, 1 files removed, 0 files unresolved |
3252 | 174 (branch merge, don't forget to commit) |
175 -------------- | |
176 M b | |
177 -------------- | |
178 | |
179 -------------- | |
180 test L:nm a b R: W: - 8 nothing | |
181 -------------- | |
182 resolving manifests | |
3314 | 183 overwrite None partial False |
184 ancestor 924404dff337 local ecf3cb2a4219+ remote 97c705ade336 | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
185 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
186 unmatched files in local: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
187 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
188 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
189 b -> a |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
190 checking for directory renames |
3252 | 191 rev: versions differ -> m |
192 merging rev | |
3314 | 193 my rev@ecf3cb2a4219+ other rev@97c705ade336 ancestor rev@924404dff337 |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
194 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
3252 | 195 (branch merge, don't forget to commit) |
196 -------------- | |
5764
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
197 C b |
3252 | 198 -------------- |
199 | |
200 -------------- | |
201 test L:um a b R:um a b W: - 9 do merge with ancestor in a | |
202 -------------- | |
203 resolving manifests | |
3314 | 204 overwrite None partial False |
205 ancestor 924404dff337 local ec03c2ca8642+ remote 79cc6877a3b7 | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
206 searching for copies back to rev 1 |
3252 | 207 b: versions differ -> m |
208 rev: versions differ -> m | |
209 merging b | |
3314 | 210 my b@ec03c2ca8642+ other b@79cc6877a3b7 ancestor a@924404dff337 |
3252 | 211 merging rev |
3314 | 212 my rev@ec03c2ca8642+ other rev@79cc6877a3b7 ancestor rev@924404dff337 |
3252 | 213 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
214 (branch merge, don't forget to commit) | |
215 -------------- | |
216 M b | |
217 -------------- | |
218 | |
219 -------------- | |
220 test L:nm a b R:nm a c W: - 11 get c, keep b | |
221 -------------- | |
222 resolving manifests | |
3314 | 223 overwrite None partial False |
224 ancestor 924404dff337 local ecf3cb2a4219+ remote e6abcc1a30c2 | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
225 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
226 unmatched files in local: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
227 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
228 unmatched files in other: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
229 c |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
230 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
231 c -> a |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
232 b -> a |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
233 checking for directory renames |
4674
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4416
diff
changeset
|
234 a: divergent renames -> dr |
3252 | 235 rev: versions differ -> m |
236 c: remote created -> g | |
4674
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4416
diff
changeset
|
237 warning: detected divergent renames of a to: |
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4416
diff
changeset
|
238 b |
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4416
diff
changeset
|
239 c |
3252 | 240 getting c |
241 merging rev | |
3314 | 242 my rev@ecf3cb2a4219+ other rev@e6abcc1a30c2 ancestor rev@924404dff337 |
3252 | 243 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
244 (branch merge, don't forget to commit) | |
245 -------------- | |
246 M c | |
5764
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
247 C b |
3252 | 248 -------------- |
249 | |
250 -------------- | |
251 test L:nc a b R:up b W: - 12 merge b no ancestor | |
252 -------------- | |
253 resolving manifests | |
3314 | 254 overwrite None partial False |
255 ancestor 924404dff337 local ac809aeed39a+ remote af30c7647fc7 | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
256 searching for copies back to rev 1 |
3252 | 257 b: versions differ -> m |
258 rev: versions differ -> m | |
259 merging b | |
3314 | 260 my b@ac809aeed39a+ other b@af30c7647fc7 ancestor b@000000000000 |
3252 | 261 merging rev |
3314 | 262 my rev@ac809aeed39a+ other rev@af30c7647fc7 ancestor rev@924404dff337 |
3252 | 263 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
264 (branch merge, don't forget to commit) | |
265 -------------- | |
266 M b | |
5764
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
267 C a |
3252 | 268 -------------- |
269 | |
270 -------------- | |
271 test L:up b R:nm a b W: - 13 merge b no ancestor | |
272 -------------- | |
273 resolving manifests | |
3314 | 274 overwrite None partial False |
275 ancestor 924404dff337 local 59318016310c+ remote e03727d2d66b | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
276 searching for copies back to rev 1 |
3252 | 277 a: other deleted -> r |
278 b: versions differ -> m | |
279 rev: versions differ -> m | |
280 removing a | |
281 merging b | |
3314 | 282 my b@59318016310c+ other b@e03727d2d66b ancestor b@000000000000 |
3252 | 283 merging rev |
3314 | 284 my rev@59318016310c+ other rev@e03727d2d66b ancestor rev@924404dff337 |
3252 | 285 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
286 (branch merge, don't forget to commit) | |
287 -------------- | |
288 M b | |
289 -------------- | |
290 | |
291 -------------- | |
292 test L:nc a b R:up a b W: - 14 merge b no ancestor | |
293 -------------- | |
294 resolving manifests | |
3314 | 295 overwrite None partial False |
296 ancestor 924404dff337 local ac809aeed39a+ remote 8dbce441892a | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
297 searching for copies back to rev 1 |
3252 | 298 a: remote is newer -> g |
299 b: versions differ -> m | |
300 rev: versions differ -> m | |
301 getting a | |
302 merging b | |
3314 | 303 my b@ac809aeed39a+ other b@8dbce441892a ancestor b@000000000000 |
3252 | 304 merging rev |
3314 | 305 my rev@ac809aeed39a+ other rev@8dbce441892a ancestor rev@924404dff337 |
3252 | 306 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
307 (branch merge, don't forget to commit) | |
308 -------------- | |
309 M a | |
310 M b | |
311 -------------- | |
312 | |
313 -------------- | |
314 test L:up b R:nm a b W: - 15 merge b no ancestor, remove a | |
315 -------------- | |
316 resolving manifests | |
3314 | 317 overwrite None partial False |
318 ancestor 924404dff337 local 59318016310c+ remote e03727d2d66b | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
319 searching for copies back to rev 1 |
3252 | 320 a: other deleted -> r |
321 b: versions differ -> m | |
322 rev: versions differ -> m | |
323 removing a | |
324 merging b | |
3314 | 325 my b@59318016310c+ other b@e03727d2d66b ancestor b@000000000000 |
3252 | 326 merging rev |
3314 | 327 my rev@59318016310c+ other rev@e03727d2d66b ancestor rev@924404dff337 |
3252 | 328 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
329 (branch merge, don't forget to commit) | |
330 -------------- | |
331 M b | |
332 -------------- | |
333 | |
334 -------------- | |
3281 | 335 test L:nc a b R:up a b W: - 16 get a, merge b no ancestor |
3252 | 336 -------------- |
337 resolving manifests | |
3314 | 338 overwrite None partial False |
339 ancestor 924404dff337 local ac809aeed39a+ remote 8dbce441892a | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
340 searching for copies back to rev 1 |
3252 | 341 a: remote is newer -> g |
342 b: versions differ -> m | |
343 rev: versions differ -> m | |
344 getting a | |
345 merging b | |
3314 | 346 my b@ac809aeed39a+ other b@8dbce441892a ancestor b@000000000000 |
3252 | 347 merging rev |
3314 | 348 my rev@ac809aeed39a+ other rev@8dbce441892a ancestor rev@924404dff337 |
3252 | 349 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
350 (branch merge, don't forget to commit) | |
351 -------------- | |
352 M a | |
353 M b | |
354 -------------- | |
355 | |
356 -------------- | |
3281 | 357 test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor |
3252 | 358 -------------- |
359 resolving manifests | |
3314 | 360 overwrite None partial False |
361 ancestor 924404dff337 local 0b76e65c8289+ remote 735846fee2d7 | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
362 searching for copies back to rev 1 |
3252 | 363 b: versions differ -> m |
364 rev: versions differ -> m | |
365 merging b | |
3314 | 366 my b@0b76e65c8289+ other b@735846fee2d7 ancestor b@000000000000 |
3252 | 367 merging rev |
3314 | 368 my rev@0b76e65c8289+ other rev@735846fee2d7 ancestor rev@924404dff337 |
3252 | 369 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
370 (branch merge, don't forget to commit) | |
371 -------------- | |
372 M b | |
5764
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
373 C a |
3252 | 374 -------------- |
375 | |
376 -------------- | |
377 test L:nm a b R:up a b W: - 18 merge b no ancestor | |
378 -------------- | |
379 resolving manifests | |
3314 | 380 overwrite None partial False |
381 ancestor 924404dff337 local ecf3cb2a4219+ remote 8dbce441892a | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
382 searching for copies back to rev 1 |
3252 | 383 b: versions differ -> m |
384 rev: versions differ -> m | |
385 a: prompt recreating -> g | |
386 getting a | |
387 merging b | |
3314 | 388 my b@ecf3cb2a4219+ other b@8dbce441892a ancestor b@000000000000 |
3252 | 389 merging rev |
3314 | 390 my rev@ecf3cb2a4219+ other rev@8dbce441892a ancestor rev@924404dff337 |
3252 | 391 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
392 (branch merge, don't forget to commit) | |
393 -------------- | |
394 M a | |
395 M b | |
396 -------------- | |
397 | |
398 -------------- | |
3281 | 399 test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a |
3252 | 400 -------------- |
401 resolving manifests | |
3314 | 402 overwrite None partial False |
403 ancestor 924404dff337 local 0b76e65c8289+ remote e03727d2d66b | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
404 searching for copies back to rev 1 |
3252 | 405 b: versions differ -> m |
406 rev: versions differ -> m | |
407 merging b | |
3314 | 408 my b@0b76e65c8289+ other b@e03727d2d66b ancestor b@000000000000 |
3252 | 409 merging rev |
3314 | 410 my rev@0b76e65c8289+ other rev@e03727d2d66b ancestor rev@924404dff337 |
3252 | 411 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
412 (branch merge, don't forget to commit) | |
413 -------------- | |
414 M b | |
5764
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
415 C a |
3252 | 416 -------------- |
417 | |
418 -------------- | |
419 test L:up a R:um a b W: - 20 merge a and b to b, remove a | |
420 -------------- | |
421 resolving manifests | |
3314 | 422 overwrite None partial False |
423 ancestor 924404dff337 local e300d1c794ec+ remote 79cc6877a3b7 | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
424 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
425 unmatched files in other: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
426 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
427 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
428 b -> a * |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
429 checking for directory renames |
3730
d377f8d25662
merge: only store one direction of copies in the copy map
Matt Mackall <mpm@selenic.com>
parents:
3727
diff
changeset
|
430 rev: versions differ -> m |
3727
0fb66912040a
merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents:
3674
diff
changeset
|
431 a: remote moved to b -> m |
5042
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
4674
diff
changeset
|
432 copying a to b |
3311
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3308
diff
changeset
|
433 merging a and b |
3314 | 434 my a@e300d1c794ec+ other b@79cc6877a3b7 ancestor a@924404dff337 |
3252 | 435 removing a |
436 merging rev | |
3314 | 437 my rev@e300d1c794ec+ other rev@79cc6877a3b7 ancestor rev@924404dff337 |
3252 | 438 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
439 (branch merge, don't forget to commit) | |
440 -------------- | |
441 M b | |
442 a | |
443 -------------- | |
444 | |
445 -------------- | |
446 test L:um a b R:up a W: - 21 merge a and b to b | |
447 -------------- | |
448 resolving manifests | |
3314 | 449 overwrite None partial False |
450 ancestor 924404dff337 local ec03c2ca8642+ remote f4db7e329e71 | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
451 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
452 unmatched files in local: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
453 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
454 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
455 b -> a * |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
456 checking for directory renames |
3727
0fb66912040a
merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents:
3674
diff
changeset
|
457 b: local moved to a -> m |
3252 | 458 rev: versions differ -> m |
3311
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3308
diff
changeset
|
459 merging b and a |
3314 | 460 my b@ec03c2ca8642+ other a@f4db7e329e71 ancestor a@924404dff337 |
3252 | 461 merging rev |
3314 | 462 my rev@ec03c2ca8642+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
3252 | 463 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
464 (branch merge, don't forget to commit) | |
465 -------------- | |
466 M b | |
3292
764688cf51e5
merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents:
3282
diff
changeset
|
467 a |
3252 | 468 -------------- |
469 | |
470 -------------- | |
471 test L:nm a b R:up a c W: - 23 get c, keep b | |
472 -------------- | |
473 resolving manifests | |
3314 | 474 overwrite None partial False |
475 ancestor 924404dff337 local ecf3cb2a4219+ remote 2b958612230f | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
476 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
477 unmatched files in local: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
478 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
479 unmatched files in other: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
480 c |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
481 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
482 b -> a * |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
483 checking for directory renames |
3727
0fb66912040a
merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents:
3674
diff
changeset
|
484 b: local moved to a -> m |
3252 | 485 rev: versions differ -> m |
486 c: remote created -> g | |
3311
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3308
diff
changeset
|
487 merging b and a |
3314 | 488 my b@ecf3cb2a4219+ other a@2b958612230f ancestor a@924404dff337 |
3252 | 489 getting c |
490 merging rev | |
3314 | 491 my rev@ecf3cb2a4219+ other rev@2b958612230f ancestor rev@924404dff337 |
3252 | 492 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
493 (branch merge, don't forget to commit) | |
494 -------------- | |
495 M b | |
3292
764688cf51e5
merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents:
3282
diff
changeset
|
496 a |
3252 | 497 M c |
498 -------------- | |
499 |