diff mercurial/copies.py @ 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 cfebb175704f
children 3ee6f1fce94a
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()