Mercurial > hg
comparison tests/test-rename-merge1.t @ 18135:a6fe1b9cc68f
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 | b87acfda5268 |
| children | 5a4f220fbfca |
comparison
equal
deleted
inserted
replaced
| 18134:6c35b53cd28b | 18135:a6fe1b9cc68f |
|---|---|
| 27 c2 | 27 c2 |
| 28 unmatched files in other: | 28 unmatched files in other: |
| 29 b | 29 b |
| 30 b2 | 30 b2 |
| 31 all copies found (* = to merge, ! = divergent, % = renamed and deleted): | 31 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
| 32 c2 -> a2 ! | 32 src: 'a2' -> dst: 'c2' ! |
| 33 b -> a * | 33 src: 'a' -> dst: 'b' * |
| 34 b2 -> a2 ! | 34 src: 'a2' -> dst: 'b2' ! |
| 35 checking for directory renames | 35 checking for directory renames |
| 36 a2: divergent renames -> dr | 36 a2: divergent renames -> dr |
| 37 resolving manifests | 37 resolving manifests |
| 38 overwrite: False, partial: False | 38 overwrite: False, partial: False |
| 39 ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c | 39 ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c |
| 174 $ hg merge --debug | 174 $ hg merge --debug |
| 175 searching for copies back to rev 1 | 175 searching for copies back to rev 1 |
| 176 unmatched files in other: | 176 unmatched files in other: |
| 177 newfile | 177 newfile |
| 178 all copies found (* = to merge, ! = divergent, % = renamed and deleted): | 178 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
| 179 newfile -> file % | 179 src: 'file' -> dst: 'newfile' % |
| 180 checking for directory renames | 180 checking for directory renames |
| 181 file: rename and delete -> rd | 181 file: rename and delete -> rd |
| 182 resolving manifests | 182 resolving manifests |
| 183 overwrite: False, partial: False | 183 overwrite: False, partial: False |
| 184 ancestor: 19d7f95df299, local: 0084274f6b67+, remote: 5d32493049f0 | 184 ancestor: 19d7f95df299, local: 0084274f6b67+, remote: 5d32493049f0 |