# HG changeset patch
# User Alexis S. L. Carvalho <alexis@cecm.usp.br>
# Date 2008-03-16 01:03:18
# Node ID 5a45c82fc7daa4bb08355c32ad3e1cd0d4841f81
# Parent  709652cd7bff6f9938b5e53667f7e4e1236c90aa

Revert cfebb175704f, fixing the output of 2 tests

diff --git a/mercurial/copies.py b/mercurial/copies.py
--- a/mercurial/copies.py
+++ b/mercurial/copies.py
@@ -68,7 +68,7 @@ def copies(repo, c1, c2, ca):
     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()
diff --git a/tests/test-git-export.out b/tests/test-git-export.out
--- a/tests/test-git-export.out
+++ b/tests/test-git-export.out
@@ -12,15 +12,9 @@ diff --git a/new b/copy
 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
diff --git a/tests/test-up-local-change.out b/tests/test-up-local-change.out
--- a/tests/test-up-local-change.out
+++ b/tests/test-up-local-change.out
@@ -17,7 +17,7 @@ summary:     1
 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 @@ summary:     1
 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