From 36508e0e396fa920aff82860894745a3e8a17456 Mon Sep 17 00:00:00 2001 From: "timeless@mozdev.org" Date: Fri, 17 Aug 2012 13:58:19 -0700 Subject: [PATCH] spelling: supersede --- mercurial/localrepo.py | 2 +- mercurial/tags.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py index 9b0aeb9609..64e4083f82 100644 --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -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() diff --git a/mercurial/tags.py b/mercurial/tags.py index e4e0129fe1..c5633e2685 100644 --- a/mercurial/tags.py +++ b/mercurial/tags.py @@ -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]