Revert cfebb175704f, fixing the output of 2 tests

mercurial/copies.py

@@ -68,7 +68,7 b' 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()

tests/test-git-export.out

@@ -12,15 +12,9 b' 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

tests/test-up-local-change.out

@@ -17,7 +17,7 b' 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 b' 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