Mercurial > hg-stable
diff tests/test-rename-dir-merge.out @ 5610:2493a478f395
copy: handle rename internally
- add rename parameter
- don't collect copied list
- report "moving" rather than "copying"
- remove renamed files
- don't return copied list
- simplify callers
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 07 Dec 2007 02:29:55 -0600 |
| parents | 56e9f7b2d8fa |
| children | 4b0c9c674707 |
line wrap: on
line diff
--- a/tests/test-rename-dir-merge.out Fri Dec 07 02:03:42 2007 -0600 +++ b/tests/test-rename-dir-merge.out Fri Dec 07 02:29:55 2007 -0600 @@ -1,10 +1,8 @@ adding a/a adding a/b 0 files updated, 0 files merged, 0 files removed, 0 files unresolved -copying a/a to b/a -copying a/b to b/b -removing a/a -removing a/b +moving a/a to b/a +moving a/b to b/b 2 files updated, 0 files merged, 2 files removed, 0 files unresolved resolving manifests overwrite None partial False