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.
comments: describe ancestor consistently - avoid 'least common ancestor'
authorMads Kiilerich <madski@unity3d.com>
Tue, 19 Aug 2014 01:13:10 +0200
changeset 22389 94f77624dbb5
parent 22388 0f0b204b399c
child 22390 e2806b8613ca
comments: describe ancestor consistently - avoid 'least common ancestor' "best" is as defined by mercurial.ancestor.ancestors: furthest from a root (as measured by longest path).
mercurial/context.py file | annotate | diff | comparison | revisions
mercurial/revlog.py file | annotate | diff | comparison | revisions
tests/test-merge-default.t file | annotate | diff | comparison | revisions 
--- a/mercurial/context.py	Tue Aug 19 01:12:56 2014 +0200
+++ b/mercurial/context.py	Tue Aug 19 01:13:10 2014 +0200
@@ -542,9 +542,11 @@
                        changectx=self, filelog=filelog)
 
     def ancestor(self, c2, warn=False):
-        """
-        return the "best" ancestor context of self and c2
-        """
+        """return the "best" ancestor context of self and c2
+
+        If there are multiple candidates, it will show a message and check
+        merge.preferancestor configuration before falling back to the
+        revlog ancestor."""
         # deal with workingctxs
         n2 = c2._node
         if n2 is None:
@@ -1146,7 +1148,7 @@
             return ''
 
     def ancestor(self, c2):
-        """return the ancestor context of self and c2"""
+        """return the "best" ancestor context of self and c2"""
         return self._parents[0].ancestor(c2) # punt on two parents for now
 
     def walk(self, match):
--- a/mercurial/revlog.py	Tue Aug 19 01:12:56 2014 +0200
+++ b/mercurial/revlog.py	Tue Aug 19 01:13:10 2014 +0200
@@ -753,7 +753,7 @@
         return a in self.commonancestorsheads(a, b)
 
     def ancestor(self, a, b):
-        """calculate the least common ancestor of nodes a and b"""
+        """calculate the "best" common ancestor of nodes a and b"""
 
         a, b = self.rev(a), self.rev(b)
         try:
--- a/tests/test-merge-default.t	Tue Aug 19 01:12:56 2014 +0200
+++ b/tests/test-merge-default.t	Tue Aug 19 01:13:10 2014 +0200
@@ -97,8 +97,7 @@
 
 
 Test for issue2043: ensure that 'merge -P' shows ancestors of 6 that
-are not ancestors of 7, regardless of where their least common
-ancestor is.
+are not ancestors of 7, regardless of where their common ancestors are.
 
 Merge preview not affected by common ancestor:
mercurial