Mercurial > hg
comparison tests/test-graft.t @ 16795:e9ae770eff1c
merge: show renamed on one and deleted on the other side in debug output
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Wed, 23 May 2012 21:34:29 +0200 |
| parents | 2a71cc53f244 |
| children | f2719b387380 |
comparison
equal
deleted
inserted
replaced
| 16794:98687cdddcb1 | 16795:e9ae770eff1c |
|---|---|
| 116 skipping already grafted revision 2 | 116 skipping already grafted revision 2 |
| 117 grafting revision 1 | 117 grafting revision 1 |
| 118 searching for copies back to rev 1 | 118 searching for copies back to rev 1 |
| 119 unmatched files in local: | 119 unmatched files in local: |
| 120 b | 120 b |
| 121 all copies found (* = to merge, ! = divergent): | 121 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
| 122 b -> a * | 122 b -> a * |
| 123 checking for directory renames | 123 checking for directory renames |
| 124 resolving manifests | 124 resolving manifests |
| 125 overwrite: False, partial: False | 125 overwrite: False, partial: False |
| 126 ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6 | 126 ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6 |