Mercurial > hg
diff mercurial/simplemerge.py @ 14549:48ec0763afbb
check-code: catch misspellings of descendant
This word is fairly common in Mercurial, and easy to misspell.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 07 Jun 2011 17:02:54 -0500 |
parents | abaacdab38f6 |
children | 774da7121fc9 |
line wrap: on
line diff
--- a/mercurial/simplemerge.py Tue Jun 07 16:02:51 2011 -0500 +++ b/mercurial/simplemerge.py Tue Jun 07 17:02:54 2011 -0500 @@ -211,7 +211,7 @@ Method is as follows: The two sequences align only on regions which match the base - and both descendents. These are found by doing a two-way diff + and both descendants. These are found by doing a two-way diff of each one against the base, and then finding the intersections between those regions. These "sync regions" are by definition unchanged in both and easily dealt with. @@ -315,7 +315,7 @@ mismatch_region = staticmethod(mismatch_region) def find_sync_regions(self): - """Return a list of sync regions, where both descendents match the base. + """Return a list of sync regions, where both descendants match the base. Generates a list of (base1, base2, a1, a2, b1, b2). There is always a zero-length sync region at the end of all the files.