Mercurial > hg-stable
changeset 6283:5a45c82fc7da
Revert cfebb175704f, fixing the output of 2 tests
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Sat, 15 Mar 2008 22:03:18 -0300 |
| parents | 709652cd7bff |
| children | c93b6c0e6e84 |
| files | mercurial/copies.py tests/test-git-export.out tests/test-up-local-change.out |
| diffstat | 3 files changed, 6 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/copies.py Sat Mar 15 22:03:18 2008 -0300 +++ b/mercurial/copies.py Sat Mar 15 22:03:18 2008 -0300 @@ -68,7 +68,7 @@ pr = repo.changelog.parentrevs def parents(rev): return [p for p in pr(rev) if p != nullrev] - limit = min(ancestor.symmetricdifference(rev1, rev2, parents) + [rev1, rev2]) + limit = min(ancestor.symmetricdifference(rev1, rev2, parents)) m1 = c1.manifest() m2 = c2.manifest() ma = ca.manifest()
--- a/tests/test-git-export.out Sat Mar 15 22:03:18 2008 -0300 +++ b/tests/test-git-export.out Sat Mar 15 22:03:18 2008 -0300 @@ -12,15 +12,9 @@ copy from new copy to copy % 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 +diff --git a/copy b/rename +rename from copy +rename to rename % delete diff --git a/rename b/rename deleted file mode 100644
--- a/tests/test-up-local-change.out Sat Mar 15 22:03:18 2008 -0300 +++ b/tests/test-up-local-change.out Sat Mar 15 22:03:18 2008 -0300 @@ -17,7 +17,7 @@ resolving manifests overwrite False partial False ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299 - searching for copies back to rev 0 + searching for copies back to rev 1 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 0 + searching for copies back to rev 1 unmatched files in other: b a: versions differ -> m