Show More
@@ -732,7 +732,7 b' class localrepository(object):' | |||||
732 | iterrevs = list(bheadrevs) |
|
732 | iterrevs = list(bheadrevs) | |
733 |
|
733 | |||
734 | # This loop prunes out two kinds of heads - heads that are |
|
734 | # This loop prunes out two kinds of heads - heads that are | |
735 |
# super |
|
735 | # superseded by a head in newheadrevs, and newheadrevs that are not | |
736 | # heads because an existing head is their descendant. |
|
736 | # heads because an existing head is their descendant. | |
737 | while iterrevs: |
|
737 | while iterrevs: | |
738 | latest = iterrevs.pop() |
|
738 | latest = iterrevs.pop() |
@@ -124,8 +124,8 b' def _updatetags(filetags, tagtype, allta' | |||||
124 | continue |
|
124 | continue | |
125 |
|
125 | |||
126 | # we prefer alltags[name] if: |
|
126 | # we prefer alltags[name] if: | |
127 |
# it super |
|
127 | # it supersedes us OR | |
128 |
# mutual super |
|
128 | # mutual supersedes and it has a higher rank | |
129 | # otherwise we win because we're tip-most |
|
129 | # otherwise we win because we're tip-most | |
130 | anode, ahist = nodehist |
|
130 | anode, ahist = nodehist | |
131 | bnode, bhist = alltags[name] |
|
131 | bnode, bhist = alltags[name] |
General Comments 0
You need to be logged in to leave comments.
Login now