Mercurial > hg

comparison tests/test-rename-merge2.t @ 18135:a6fe1b9cc68f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies: make debug messages more sensible The -> in debug messages is currently overloaded to mean both source to dest and dest to source. To fix this, we add explicit labels and make the arrow direction consistent.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 26 Dec 2012 15:03:58 -0800
parents f2719b387380
children 5a4f220fbfca
comparison
equal deleted inserted replaced
18134:6c35b53cd28b 18135:a6fe1b9cc68f
79 -------------- 79 --------------
80 searching for copies back to rev 1 80 searching for copies back to rev 1
81 unmatched files in other: 81 unmatched files in other:
82 b 82 b
83 all copies found (* = to merge, ! = divergent, % = renamed and deleted): 83 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
84 b -> a * 84 src: 'a' -> dst: 'b' *
85 checking for directory renames 85 checking for directory renames
86 resolving manifests 86 resolving manifests
87 overwrite: False, partial: False 87 overwrite: False, partial: False
88 ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24 88 ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24
89 rev: versions differ -> m 89 rev: versions differ -> m
114 -------------- 114 --------------
115 searching for copies back to rev 1 115 searching for copies back to rev 1
116 unmatched files in local: 116 unmatched files in local:
117 b 117 b
118 all copies found (* = to merge, ! = divergent, % = renamed and deleted): 118 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
119 b -> a * 119 src: 'a' -> dst: 'b' *
120 checking for directory renames 120 checking for directory renames
121 resolving manifests 121 resolving manifests
122 overwrite: False, partial: False 122 overwrite: False, partial: False
123 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: f4db7e329e71 123 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: f4db7e329e71
124 a: remote is newer -> g 124 a: remote is newer -> g
152 -------------- 152 --------------
153 searching for copies back to rev 1 153 searching for copies back to rev 1
154 unmatched files in other: 154 unmatched files in other:
155 b 155 b
156 all copies found (* = to merge, ! = divergent, % = renamed and deleted): 156 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
157 b -> a * 157 src: 'a' -> dst: 'b' *
158 checking for directory renames 158 checking for directory renames
159 resolving manifests 159 resolving manifests
160 overwrite: False, partial: False 160 overwrite: False, partial: False
161 ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a 161 ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a
162 rev: versions differ -> m 162 rev: versions differ -> m
187 -------------- 187 --------------
188 searching for copies back to rev 1 188 searching for copies back to rev 1
189 unmatched files in local: 189 unmatched files in local:
190 b 190 b
191 all copies found (* = to merge, ! = divergent, % = renamed and deleted): 191 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
192 b -> a * 192 src: 'a' -> dst: 'b' *
193 checking for directory renames 193 checking for directory renames
194 resolving manifests 194 resolving manifests
195 overwrite: False, partial: False 195 overwrite: False, partial: False
196 ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71 196 ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71
197 b: local copied/moved to a -> m 197 b: local copied/moved to a -> m
221 -------------- 221 --------------
222 searching for copies back to rev 1 222 searching for copies back to rev 1
223 unmatched files in other: 223 unmatched files in other:
224 b 224 b
225 all copies found (* = to merge, ! = divergent, % = renamed and deleted): 225 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
226 b -> a 226 src: 'a' -> dst: 'b'
227 checking for directory renames 227 checking for directory renames
228 resolving manifests 228 resolving manifests
229 overwrite: False, partial: False 229 overwrite: False, partial: False
230 ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: 4ce40f5aca24 230 ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: 4ce40f5aca24
231 rev: versions differ -> m 231 rev: versions differ -> m
251 -------------- 251 --------------
252 searching for copies back to rev 1 252 searching for copies back to rev 1
253 unmatched files in local: 253 unmatched files in local:
254 b 254 b
255 all copies found (* = to merge, ! = divergent, % = renamed and deleted): 255 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
256 b -> a 256 src: 'a' -> dst: 'b'
257 checking for directory renames 257 checking for directory renames
258 resolving manifests 258 resolving manifests
259 overwrite: False, partial: False 259 overwrite: False, partial: False
260 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336 260 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336
261 rev: versions differ -> m 261 rev: versions differ -> m
278 -------------- 278 --------------
279 searching for copies back to rev 1 279 searching for copies back to rev 1
280 unmatched files in other: 280 unmatched files in other:
281 b 281 b
282 all copies found (* = to merge, ! = divergent, % = renamed and deleted): 282 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
283 b -> a 283 src: 'a' -> dst: 'b'
284 checking for directory renames 284 checking for directory renames
285 resolving manifests 285 resolving manifests
286 overwrite: False, partial: False 286 overwrite: False, partial: False
287 ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: bdb19105162a 287 ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: bdb19105162a
288 a: other deleted -> r 288 a: other deleted -> r
310 -------------- 310 --------------
311 searching for copies back to rev 1 311 searching for copies back to rev 1
312 unmatched files in local: 312 unmatched files in local:
313 b 313 b
314 all copies found (* = to merge, ! = divergent, % = renamed and deleted): 314 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
315 b -> a 315 src: 'a' -> dst: 'b'
316 checking for directory renames 316 checking for directory renames
317 resolving manifests 317 resolving manifests
318 overwrite: False, partial: False 318 overwrite: False, partial: False
319 ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336 319 ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336
320 rev: versions differ -> m 320 rev: versions differ -> m
368 unmatched files in local: 368 unmatched files in local:
369 b 369 b
370 unmatched files in other: 370 unmatched files in other:
371 c 371 c
372 all copies found (* = to merge, ! = divergent, % = renamed and deleted): 372 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
373 c -> a ! 373 src: 'a' -> dst: 'c' !
374 b -> a ! 374 src: 'a' -> dst: 'b' !
375 checking for directory renames 375 checking for directory renames
376 a: divergent renames -> dr 376 a: divergent renames -> dr
377 resolving manifests 377 resolving manifests
378 overwrite: False, partial: False 378 overwrite: False, partial: False
379 ancestor: 924404dff337, local: 02963e448370+, remote: fe905ef2c33e 379 ancestor: 924404dff337, local: 02963e448370+, remote: fe905ef2c33e
647 -------------- 647 --------------
648 searching for copies back to rev 1 648 searching for copies back to rev 1
649 unmatched files in other: 649 unmatched files in other:
650 b 650 b
651 all copies found (* = to merge, ! = divergent, % = renamed and deleted): 651 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
652 b -> a * 652 src: 'a' -> dst: 'b' *
653 checking for directory renames 653 checking for directory renames
654 resolving manifests 654 resolving manifests
655 overwrite: False, partial: False 655 overwrite: False, partial: False
656 ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493 656 ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493
657 rev: versions differ -> m 657 rev: versions differ -> m
681 -------------- 681 --------------
682 searching for copies back to rev 1 682 searching for copies back to rev 1
683 unmatched files in local: 683 unmatched files in local:
684 b 684 b
685 all copies found (* = to merge, ! = divergent, % = renamed and deleted): 685 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
686 b -> a * 686 src: 'a' -> dst: 'b' *
687 checking for directory renames 687 checking for directory renames
688 resolving manifests 688 resolving manifests
689 overwrite: False, partial: False 689 overwrite: False, partial: False
690 ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71 690 ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71
691 b: local copied/moved to a -> m 691 b: local copied/moved to a -> m
719 unmatched files in local: 719 unmatched files in local:
720 b 720 b
721 unmatched files in other: 721 unmatched files in other:
722 c 722 c
723 all copies found (* = to merge, ! = divergent, % = renamed and deleted): 723 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
724 b -> a * 724 src: 'a' -> dst: 'b' *
725 checking for directory renames 725 checking for directory renames
726 resolving manifests 726 resolving manifests
727 overwrite: False, partial: False 727 overwrite: False, partial: False
728 ancestor: 924404dff337, local: 02963e448370+, remote: 2b958612230f 728 ancestor: 924404dff337, local: 02963e448370+, remote: 2b958612230f
729 b: local copied/moved to a -> m 729 b: local copied/moved to a -> m