Mercurial > hg-stable
comparison tests/test-copy-move-merge.t @ 18362:5a4f220fbfca
copies: report found copies sorted
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Wed, 12 Dec 2012 02:38:14 +0100 |
| parents | 760c0d67ce5e |
| children | 5ed6a375e9ca |
comparison
equal
deleted
inserted
replaced
| 18361:06f075836010 | 18362:5a4f220fbfca |
|---|---|
| 23 searching for copies back to rev 1 | 23 searching for copies back to rev 1 |
| 24 unmatched files in other: | 24 unmatched files in other: |
| 25 b | 25 b |
| 26 c | 26 c |
| 27 all copies found (* = to merge, ! = divergent, % = renamed and deleted): | 27 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
| 28 src: 'a' -> dst: 'b' * | |
| 28 src: 'a' -> dst: 'c' * | 29 src: 'a' -> dst: 'c' * |
| 29 src: 'a' -> dst: 'b' * | |
| 30 checking for directory renames | 30 checking for directory renames |
| 31 resolving manifests | 31 resolving manifests |
| 32 overwrite: False, partial: False | 32 overwrite: False, partial: False |
| 33 ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6 | 33 ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6 |
| 34 a: remote moved to b -> m | 34 a: remote moved to b -> m |