# HG changeset patch
# User Alexis S. L. Carvalho <alexis@cecm.usp.br>
# Date 1205629398 10800
# Node ID 5a45c82fc7daa4bb08355c32ad3e1cd0d4841f81
# Parent  709652cd7bff6f9938b5e53667f7e4e1236c90aa
Revert cfebb175704f, fixing the output of 2 tests

diff -r 709652cd7bff -r 5a45c82fc7da mercurial/copies.py
--- 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()
diff -r 709652cd7bff -r 5a45c82fc7da tests/test-git-export.out
--- 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
diff -r 709652cd7bff -r 5a45c82fc7da tests/test-up-local-change.out
--- 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