Mercurial > hg
changeset 6279:c50ac875ffcb
update tests for copy detection changes
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sat, 15 Mar 2008 16:51:53 -0500 |
| parents | 81e7112b07ae |
| children | 9db24a36d182 |
| files | tests/test-git-export.out tests/test-up-local-change.out |
| diffstat | 2 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-git-export.out Sat Mar 15 16:49:27 2008 -0500 +++ b/tests/test-git-export.out Sat Mar 15 16:51:53 2008 -0500 @@ -12,9 +12,15 @@ copy from new copy to copy % rename -diff --git a/copy b/rename -rename from copy -rename to rename +diff --git a/copy b/copy +deleted file mode 100644 +--- a/copy ++++ /dev/null +@@ -1,1 +0,0 @@ +-new +diff --git a/new b/rename +copy from new +copy to rename % delete diff --git a/rename b/rename deleted file mode 100644
--- a/tests/test-up-local-change.out Sat Mar 15 16:49:27 2008 -0500 +++ b/tests/test-up-local-change.out Sat Mar 15 16:51:53 2008 -0500 @@ -17,7 +17,7 @@ resolving manifests overwrite False partial False ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299 - searching for copies back to rev 1 + searching for copies back to rev 0 unmatched files in other: b a: versions differ -> m @@ -54,7 +54,7 @@ resolving manifests overwrite False partial False ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299 - searching for copies back to rev 1 + searching for copies back to rev 0 unmatched files in other: b a: versions differ -> m