diff -r 14d647d25c70 -r d8e0c591781c mercurial/context.py --- a/mercurial/context.py Fri Feb 27 21:42:58 2015 +0100 +++ b/mercurial/context.py Sun Jan 18 02:38:57 2015 +0100 @@ -754,7 +754,7 @@ return True def _adjustlinkrev(self, path, filelog, fnode, srcrev, inclusive=False): - """return the first ancestor of introducting + """return the first ancestor of introducing If the linkrev of the file revision does not point to an ancestor of srcrev, we'll walk down the ancestors until we find one introducing @@ -826,7 +826,7 @@ # be replaced with the rename information. This parent is -always- # the first one. # - # As null id have alway been filtered out in the previous list + # As null id have always been filtered out in the previous list # comprehension, inserting to 0 will always result in "replacing # first nullid parent with rename information. pl.insert(0, (r[0], r[1], self._repo.file(r[0])))