Mercurial > hg
comparison tests/test-rename-merge2.t @ 18362:5a4f220fbfca
copies: report found copies sorted
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Wed, 12 Dec 2012 02:38:14 +0100 |
| parents | a6fe1b9cc68f |
| children | cf25e4efd685 |
comparison
equal
deleted
inserted
replaced
| 18361:06f075836010 | 18362:5a4f220fbfca |
|---|---|
| 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 src: 'a' -> dst: 'b' ! | |
| 373 src: 'a' -> dst: 'c' ! | 374 src: 'a' -> dst: 'c' ! |
| 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 |