Mercurial > public > mercurial-scm > hg-stable
diff mercurial/obsolete.py @ 17537:31f32a96e1e3
Merge spelling fixes
author | Bryan O'Sullivan <bryano@fb.com> |
---|---|
date | Tue, 11 Sep 2012 08:36:09 -0700 |
parents | f85816af6294 a736e1e15e46 |
children | 0496d4f73cf4 |
line wrap: on
line diff
--- a/mercurial/obsolete.py Tue Sep 11 00:12:07 2012 +0200 +++ b/mercurial/obsolete.py Tue Sep 11 08:36:09 2012 -0700 @@ -226,9 +226,9 @@ self.caches.clear() return len(new) - def mergemarkers(self, transation, data): + def mergemarkers(self, transaction, data): markers = _readmarkers(data) - self.add(transation, markers) + self.add(transaction, markers) def _load(self, markers): for mark in markers: @@ -320,7 +320,7 @@ def anysuccessors(obsstore, node): """Yield every successor of <node> - This is a linear yield unsuitable to detect split changesets.""" + This is a linear yield unsuited to detecting split changesets.""" remaining = set([node]) seen = set(remaining) while remaining: