facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity

spelling: supersede

Browse Source
This commit is contained in:
timeless@mozdev.org 2012-08-17 13:58:19 -07:00
parent dbc876a6d7
commit 36508e0e39
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mercurial/localrepo.py
View File

@ -732,7 +732,7 @@ class localrepository(object):
iterrevs = list(bheadrevs)
# This loop prunes out two kinds of heads - heads that are
# superceded by a head in newheadrevs, and newheadrevs that are not
# superseded by a head in newheadrevs, and newheadrevs that are not
# heads because an existing head is their descendant.
while iterrevs:
latest = iterrevs.pop()

4
mercurial/tags.py
View File

@ -124,8 +124,8 @@ def _updatetags(filetags, tagtype, alltags, tagtypes):
continue
# we prefer alltags[name] if:
# it supercedes us OR
# mutual supercedes and it has a higher rank
# it supersedes us OR
# mutual supersedes and it has a higher rank
# otherwise we win because we're tip-most
anode, ahist = nodehist
bnode, bhist = alltags[name]