Mercurial > public > mercurial-scm > hg
diff mercurial/revlog.py @ 22389:94f77624dbb5
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).
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Tue, 19 Aug 2014 01:13:10 +0200 |
| parents | 392ae5cb8d62 |
| children | 0f4e655136ef |
line wrap: on
line diff
--- 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: