Mercurial > hg
annotate tests/test-rename-merge2.out @ 4894:be5dc5e3ab2d
hg parents: don't pass an OS-specific path to repo.filectx
The only reason to use the matcher code instead of calling util.canonpath
directly is to be able to use "path:canonical/path/to/file" patterns.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Tue, 17 Jul 2007 09:08:29 -0300 |
parents | 723e0ddb6ada |
children | f191bc3916f7 |
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 | |
3252 | 7 rev: versions differ -> m |
3727
0fb66912040a
merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents:
3674
diff
changeset
|
8 a: remote copied to b -> m |
3311
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3308
diff
changeset
|
9 merging a and b |
3314 | 10 my a@e300d1c794ec+ other b@735846fee2d7 ancestor a@924404dff337 |
3252 | 11 copying a to b |
12 merging rev | |
3314 | 13 my rev@e300d1c794ec+ other rev@735846fee2d7 ancestor rev@924404dff337 |
3252 | 14 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
15 (branch merge, don't forget to commit) | |
16 -------------- | |
3282
438b0638dbf5
Fix undetected change bug in rename tests
Matt Mackall <mpm@selenic.com>
parents:
3281
diff
changeset
|
17 M a |
3252 | 18 M b |
19 a | |
20 -------------- | |
21 | |
22 -------------- | |
23 test L:nc a b R:up a W: - 2 get rem change to a and b | |
24 -------------- | |
25 resolving manifests | |
3314 | 26 overwrite None partial False |
27 ancestor 924404dff337 local ac809aeed39a+ remote f4db7e329e71 | |
3252 | 28 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
|
29 b: local copied to a -> m |
3252 | 30 rev: versions differ -> m |
31 getting a | |
3311
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3308
diff
changeset
|
32 merging b and a |
3314 | 33 my b@ac809aeed39a+ other a@f4db7e329e71 ancestor a@924404dff337 |
3252 | 34 merging rev |
3314 | 35 my rev@ac809aeed39a+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
3252 | 36 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
37 (branch merge, don't forget to commit) | |
38 -------------- | |
39 M a | |
40 M b | |
3292
764688cf51e5
merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents:
3282
diff
changeset
|
41 a |
3252 | 42 -------------- |
43 | |
44 -------------- | |
45 test L:up a R:nm a b W: - 3 get local a change to b, remove a | |
46 -------------- | |
47 resolving manifests | |
3314 | 48 overwrite None partial False |
49 ancestor 924404dff337 local e300d1c794ec+ remote e03727d2d66b | |
3730
d377f8d25662
merge: only store one direction of copies in the copy map
Matt Mackall <mpm@selenic.com>
parents:
3727
diff
changeset
|
50 rev: versions differ -> m |
3727
0fb66912040a
merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents:
3674
diff
changeset
|
51 a: remote moved to b -> m |
3311
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3308
diff
changeset
|
52 merging a and b |
3314 | 53 my a@e300d1c794ec+ other b@e03727d2d66b ancestor a@924404dff337 |
3252 | 54 copying a to b |
55 removing a | |
56 merging rev | |
3314 | 57 my rev@e300d1c794ec+ other rev@e03727d2d66b ancestor rev@924404dff337 |
3252 | 58 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
59 (branch merge, don't forget to commit) | |
60 -------------- | |
61 M b | |
62 a | |
63 -------------- | |
64 | |
65 -------------- | |
66 test L:nm a b R:up a W: - 4 get remote change to b | |
67 -------------- | |
68 resolving manifests | |
3314 | 69 overwrite None partial False |
70 ancestor 924404dff337 local ecf3cb2a4219+ remote f4db7e329e71 | |
3727
0fb66912040a
merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents:
3674
diff
changeset
|
71 b: local moved to a -> m |
3252 | 72 rev: versions differ -> m |
3311
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3308
diff
changeset
|
73 merging b and a |
3314 | 74 my b@ecf3cb2a4219+ other a@f4db7e329e71 ancestor a@924404dff337 |
3252 | 75 merging rev |
3314 | 76 my rev@ecf3cb2a4219+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
3252 | 77 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
78 (branch merge, don't forget to commit) | |
79 -------------- | |
80 M b | |
3292
764688cf51e5
merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents:
3282
diff
changeset
|
81 a |
3252 | 82 -------------- |
83 | |
84 -------------- | |
85 test L: R:nc a b W: - 5 get b | |
86 -------------- | |
87 resolving manifests | |
3314 | 88 overwrite None partial False |
89 ancestor 924404dff337 local 94b33a1b7f2d+ remote 735846fee2d7 | |
3252 | 90 rev: versions differ -> m |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
91 b: remote created -> g |
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
92 getting b |
3252 | 93 merging rev |
3314 | 94 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
|
95 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
3252 | 96 (branch merge, don't forget to commit) |
97 -------------- | |
98 M b | |
3311
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3308
diff
changeset
|
99 C a |
3252 | 100 -------------- |
101 | |
102 -------------- | |
103 test L:nc a b R: W: - 6 nothing | |
104 -------------- | |
105 resolving manifests | |
3314 | 106 overwrite None partial False |
107 ancestor 924404dff337 local ac809aeed39a+ remote 97c705ade336 | |
3252 | 108 rev: versions differ -> m |
109 merging rev | |
3314 | 110 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
|
111 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
3252 | 112 (branch merge, don't forget to commit) |
113 -------------- | |
114 C a | |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
115 C b |
3252 | 116 -------------- |
117 | |
118 -------------- | |
119 test L: R:nm a b W: - 7 get b | |
120 -------------- | |
121 resolving manifests | |
3314 | 122 overwrite None partial False |
123 ancestor 924404dff337 local 94b33a1b7f2d+ remote e03727d2d66b | |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
124 a: other deleted -> r |
3252 | 125 rev: versions differ -> m |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
126 b: remote created -> g |
3252 | 127 removing a |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
128 getting b |
3252 | 129 merging rev |
3314 | 130 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
|
131 1 files updated, 1 files merged, 1 files removed, 0 files unresolved |
3252 | 132 (branch merge, don't forget to commit) |
133 -------------- | |
134 M b | |
135 -------------- | |
136 | |
137 -------------- | |
138 test L:nm a b R: W: - 8 nothing | |
139 -------------- | |
140 resolving manifests | |
3314 | 141 overwrite None partial False |
142 ancestor 924404dff337 local ecf3cb2a4219+ remote 97c705ade336 | |
3252 | 143 rev: versions differ -> m |
144 merging rev | |
3314 | 145 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
|
146 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
3252 | 147 (branch merge, don't forget to commit) |
148 -------------- | |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
149 C b |
3252 | 150 -------------- |
151 | |
152 -------------- | |
153 test L:um a b R:um a b W: - 9 do merge with ancestor in a | |
154 -------------- | |
155 resolving manifests | |
3314 | 156 overwrite None partial False |
157 ancestor 924404dff337 local ec03c2ca8642+ remote 79cc6877a3b7 | |
3252 | 158 b: versions differ -> m |
159 rev: versions differ -> m | |
160 merging b | |
3314 | 161 my b@ec03c2ca8642+ other b@79cc6877a3b7 ancestor a@924404dff337 |
3252 | 162 merging rev |
3314 | 163 my rev@ec03c2ca8642+ other rev@79cc6877a3b7 ancestor rev@924404dff337 |
3252 | 164 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
165 (branch merge, don't forget to commit) | |
166 -------------- | |
167 M b | |
168 -------------- | |
169 | |
170 -------------- | |
171 test L:nm a b R:nm a c W: - 11 get c, keep b | |
172 -------------- | |
173 resolving manifests | |
3314 | 174 overwrite None partial False |
175 ancestor 924404dff337 local ecf3cb2a4219+ remote e6abcc1a30c2 | |
4674
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4416
diff
changeset
|
176 a: divergent renames -> dr |
3252 | 177 rev: versions differ -> m |
178 c: remote created -> g | |
4674
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4416
diff
changeset
|
179 warning: detected divergent renames of a to: |
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4416
diff
changeset
|
180 b |
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4416
diff
changeset
|
181 c |
3252 | 182 getting c |
183 merging rev | |
3314 | 184 my rev@ecf3cb2a4219+ other rev@e6abcc1a30c2 ancestor rev@924404dff337 |
3252 | 185 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
186 (branch merge, don't forget to commit) | |
187 -------------- | |
188 M c | |
189 C b | |
190 -------------- | |
191 | |
192 -------------- | |
193 test L:nc a b R:up b W: - 12 merge b no ancestor | |
194 -------------- | |
195 resolving manifests | |
3314 | 196 overwrite None partial False |
197 ancestor 924404dff337 local ac809aeed39a+ remote af30c7647fc7 | |
3252 | 198 b: versions differ -> m |
199 rev: versions differ -> m | |
200 merging b | |
3314 | 201 my b@ac809aeed39a+ other b@af30c7647fc7 ancestor b@000000000000 |
3252 | 202 merging rev |
3314 | 203 my rev@ac809aeed39a+ other rev@af30c7647fc7 ancestor rev@924404dff337 |
3252 | 204 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
205 (branch merge, don't forget to commit) | |
206 -------------- | |
207 M b | |
208 C a | |
209 -------------- | |
210 | |
211 -------------- | |
212 test L:up b R:nm a b W: - 13 merge b no ancestor | |
213 -------------- | |
214 resolving manifests | |
3314 | 215 overwrite None partial False |
216 ancestor 924404dff337 local 59318016310c+ remote e03727d2d66b | |
3252 | 217 a: other deleted -> r |
218 b: versions differ -> m | |
219 rev: versions differ -> m | |
220 removing a | |
221 merging b | |
3314 | 222 my b@59318016310c+ other b@e03727d2d66b ancestor b@000000000000 |
3252 | 223 merging rev |
3314 | 224 my rev@59318016310c+ other rev@e03727d2d66b ancestor rev@924404dff337 |
3252 | 225 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
226 (branch merge, don't forget to commit) | |
227 -------------- | |
228 M b | |
229 -------------- | |
230 | |
231 -------------- | |
232 test L:nc a b R:up a b W: - 14 merge b no ancestor | |
233 -------------- | |
234 resolving manifests | |
3314 | 235 overwrite None partial False |
236 ancestor 924404dff337 local ac809aeed39a+ remote 8dbce441892a | |
3252 | 237 a: remote is newer -> g |
238 b: versions differ -> m | |
239 rev: versions differ -> m | |
240 getting a | |
241 merging b | |
3314 | 242 my b@ac809aeed39a+ other b@8dbce441892a ancestor b@000000000000 |
3252 | 243 merging rev |
3314 | 244 my rev@ac809aeed39a+ other rev@8dbce441892a ancestor rev@924404dff337 |
3252 | 245 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
246 (branch merge, don't forget to commit) | |
247 -------------- | |
248 M a | |
249 M b | |
250 -------------- | |
251 | |
252 -------------- | |
253 test L:up b R:nm a b W: - 15 merge b no ancestor, remove a | |
254 -------------- | |
255 resolving manifests | |
3314 | 256 overwrite None partial False |
257 ancestor 924404dff337 local 59318016310c+ remote e03727d2d66b | |
3252 | 258 a: other deleted -> r |
259 b: versions differ -> m | |
260 rev: versions differ -> m | |
261 removing a | |
262 merging b | |
3314 | 263 my b@59318016310c+ other b@e03727d2d66b ancestor b@000000000000 |
3252 | 264 merging rev |
3314 | 265 my rev@59318016310c+ other rev@e03727d2d66b ancestor rev@924404dff337 |
3252 | 266 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
267 (branch merge, don't forget to commit) | |
268 -------------- | |
269 M b | |
270 -------------- | |
271 | |
272 -------------- | |
3281 | 273 test L:nc a b R:up a b W: - 16 get a, merge b no ancestor |
3252 | 274 -------------- |
275 resolving manifests | |
3314 | 276 overwrite None partial False |
277 ancestor 924404dff337 local ac809aeed39a+ remote 8dbce441892a | |
3252 | 278 a: remote is newer -> g |
279 b: versions differ -> m | |
280 rev: versions differ -> m | |
281 getting a | |
282 merging b | |
3314 | 283 my b@ac809aeed39a+ other b@8dbce441892a ancestor b@000000000000 |
3252 | 284 merging rev |
3314 | 285 my rev@ac809aeed39a+ other rev@8dbce441892a ancestor rev@924404dff337 |
3252 | 286 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
287 (branch merge, don't forget to commit) | |
288 -------------- | |
289 M a | |
290 M b | |
291 -------------- | |
292 | |
293 -------------- | |
3281 | 294 test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor |
3252 | 295 -------------- |
296 resolving manifests | |
3314 | 297 overwrite None partial False |
298 ancestor 924404dff337 local 0b76e65c8289+ remote 735846fee2d7 | |
3252 | 299 b: versions differ -> m |
300 rev: versions differ -> m | |
301 merging b | |
3314 | 302 my b@0b76e65c8289+ other b@735846fee2d7 ancestor b@000000000000 |
3252 | 303 merging rev |
3314 | 304 my rev@0b76e65c8289+ other rev@735846fee2d7 ancestor rev@924404dff337 |
3252 | 305 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
306 (branch merge, don't forget to commit) | |
307 -------------- | |
308 M b | |
309 C a | |
310 -------------- | |
311 | |
312 -------------- | |
313 test L:nm a b R:up a b W: - 18 merge b no ancestor | |
314 -------------- | |
315 resolving manifests | |
3314 | 316 overwrite None partial False |
317 ancestor 924404dff337 local ecf3cb2a4219+ remote 8dbce441892a | |
3252 | 318 b: versions differ -> m |
319 rev: versions differ -> m | |
320 a: prompt recreating -> g | |
321 getting a | |
322 merging b | |
3314 | 323 my b@ecf3cb2a4219+ other b@8dbce441892a ancestor b@000000000000 |
3252 | 324 merging rev |
3314 | 325 my rev@ecf3cb2a4219+ other rev@8dbce441892a ancestor rev@924404dff337 |
3252 | 326 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
327 (branch merge, don't forget to commit) | |
328 -------------- | |
329 M a | |
330 M b | |
331 -------------- | |
332 | |
333 -------------- | |
3281 | 334 test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a |
3252 | 335 -------------- |
336 resolving manifests | |
3314 | 337 overwrite None partial False |
338 ancestor 924404dff337 local 0b76e65c8289+ remote e03727d2d66b | |
3252 | 339 b: versions differ -> m |
340 rev: versions differ -> m | |
341 merging b | |
3314 | 342 my b@0b76e65c8289+ other b@e03727d2d66b ancestor b@000000000000 |
3252 | 343 merging rev |
3314 | 344 my rev@0b76e65c8289+ other rev@e03727d2d66b ancestor rev@924404dff337 |
3252 | 345 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
346 (branch merge, don't forget to commit) | |
347 -------------- | |
348 M b | |
349 C a | |
350 -------------- | |
351 | |
352 -------------- | |
353 test L:up a R:um a b W: - 20 merge a and b to b, remove a | |
354 -------------- | |
355 resolving manifests | |
3314 | 356 overwrite None partial False |
357 ancestor 924404dff337 local e300d1c794ec+ remote 79cc6877a3b7 | |
3730
d377f8d25662
merge: only store one direction of copies in the copy map
Matt Mackall <mpm@selenic.com>
parents:
3727
diff
changeset
|
358 rev: versions differ -> m |
3727
0fb66912040a
merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents:
3674
diff
changeset
|
359 a: remote moved to b -> m |
3311
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3308
diff
changeset
|
360 merging a and b |
3314 | 361 my a@e300d1c794ec+ other b@79cc6877a3b7 ancestor a@924404dff337 |
3252 | 362 copying a to b |
363 removing a | |
364 merging rev | |
3314 | 365 my rev@e300d1c794ec+ other rev@79cc6877a3b7 ancestor rev@924404dff337 |
3252 | 366 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
367 (branch merge, don't forget to commit) | |
368 -------------- | |
369 M b | |
370 a | |
371 -------------- | |
372 | |
373 -------------- | |
374 test L:um a b R:up a W: - 21 merge a and b to b | |
375 -------------- | |
376 resolving manifests | |
3314 | 377 overwrite None partial False |
378 ancestor 924404dff337 local ec03c2ca8642+ remote f4db7e329e71 | |
3727
0fb66912040a
merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents:
3674
diff
changeset
|
379 b: local moved to a -> m |
3252 | 380 rev: versions differ -> m |
3311
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3308
diff
changeset
|
381 merging b and a |
3314 | 382 my b@ec03c2ca8642+ other a@f4db7e329e71 ancestor a@924404dff337 |
3252 | 383 merging rev |
3314 | 384 my rev@ec03c2ca8642+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
3252 | 385 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
386 (branch merge, don't forget to commit) | |
387 -------------- | |
388 M b | |
3292
764688cf51e5
merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents:
3282
diff
changeset
|
389 a |
3252 | 390 -------------- |
391 | |
392 -------------- | |
393 test L:nm a b R:up a c W: - 23 get c, keep b | |
394 -------------- | |
395 resolving manifests | |
3314 | 396 overwrite None partial False |
397 ancestor 924404dff337 local ecf3cb2a4219+ remote 2b958612230f | |
3727
0fb66912040a
merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents:
3674
diff
changeset
|
398 b: local moved to a -> m |
3252 | 399 rev: versions differ -> m |
400 c: remote created -> g | |
3311
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3308
diff
changeset
|
401 merging b and a |
3314 | 402 my b@ecf3cb2a4219+ other a@2b958612230f ancestor a@924404dff337 |
3252 | 403 getting c |
404 merging rev | |
3314 | 405 my rev@ecf3cb2a4219+ other rev@2b958612230f ancestor rev@924404dff337 |
3252 | 406 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
407 (branch merge, don't forget to commit) | |
408 -------------- | |
409 M b | |
3292
764688cf51e5
merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents:
3282
diff
changeset
|
410 a |
3252 | 411 M c |
412 -------------- | |
413 |