Mercurial > hg
diff 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 |
line wrap: on
line diff
--- a/tests/test-rename-merge1.t Wed Dec 26 14:50:17 2012 -0800 +++ b/tests/test-rename-merge1.t Wed Dec 26 15:03:58 2012 -0800 @@ -29,9 +29,9 @@ b b2 all copies found (* = to merge, ! = divergent, % = renamed and deleted): - c2 -> a2 ! - b -> a * - b2 -> a2 ! + src: 'a2' -> dst: 'c2' ! + src: 'a' -> dst: 'b' * + src: 'a2' -> dst: 'b2' ! checking for directory renames a2: divergent renames -> dr resolving manifests @@ -176,7 +176,7 @@ unmatched files in other: newfile all copies found (* = to merge, ! = divergent, % = renamed and deleted): - newfile -> file % + src: 'file' -> dst: 'newfile' % checking for directory renames file: rename and delete -> rd resolving manifests