diff --git a/mercurial/phases.py b/mercurial/phases.py index 4a8bb136ee779b9763a6dfcdb707ba5894f5e36d_bWVyY3VyaWFsL3BoYXNlcy5weQ==..e4eeb9fedfe31087dbf6982382b27183f42f84d4_bWVyY3VyaWFsL3BoYXNlcy5weQ== 100644 --- a/mercurial/phases.py +++ b/mercurial/phases.py @@ -869,6 +869,8 @@ start = min(new_revs) end = len(cl) rev_phases = [None] * (end - start) + + this_phase_set = self._phasesets[targetphase] for r in range(start, end): # gather information about the current_rev @@ -893,6 +895,7 @@ new_roots.add(r) rev_phases[r - start] = targetphase changed_revs[r] = r_phase + this_phase_set.add(r) elif p_phase is None: rev_phases[r - start] = r_phase else: @@ -903,6 +906,7 @@ if p_phase == targetphase: if p_phase > r_phase: changed_revs[r] = r_phase + this_phase_set.add(r) elif r in currentroots: replaced_roots.add(r) sets = self._phasesets @@ -906,10 +910,10 @@ elif r in currentroots: replaced_roots.add(r) sets = self._phasesets - sets[targetphase].update(changed_revs) - for r, old in changed_revs.items(): - if old > public: - sets[old].discard(r) + if targetphase > draft: + for r, old in changed_revs.items(): + if old > public: + sets[old].discard(r) if new_roots: assert changed_revs