Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies: deal with symmetric difference for linear relationships
authorMatt Mackall <mpm@selenic.com>
Sat, 15 Mar 2008 16:25:27 -0500
changeset 6277 cfebb175704f
parent 6276 c93ca83a3354
child 6278 81e7112b07ae
copies: deal with symmetric difference for linear relationships choose the minimum of symmetric difference and the two revs in question
mercurial/copies.py file | annotate | diff | comparison | revisions 
--- a/mercurial/copies.py	Sat Mar 15 16:24:16 2008 -0500
+++ b/mercurial/copies.py	Sat Mar 15 16:25:27 2008 -0500
@@ -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))
+    limit = min(ancestor.symmetricdifference(rev1, rev2, parents) + [rev1, rev2])
     m1 = c1.manifest()
     m2 = c2.manifest()
     ma = ca.manifest()
mercurial