mercurial/phases.py
branchstable
changeset 51516 e0f92bd98c24
parent 51505 c9ceb4f60256
child 51517 4ee50d98d35c
equal deleted inserted replaced
51514:394ea4428163 51516:e0f92bd98c24
   905                         changed_revs[r] = r_phase
   905                         changed_revs[r] = r_phase
   906                     elif r in currentroots:
   906                     elif r in currentroots:
   907                         replaced_roots.add(r)
   907                         replaced_roots.add(r)
   908             sets = self._phasesets
   908             sets = self._phasesets
   909             sets[targetphase].update(changed_revs)
   909             sets[targetphase].update(changed_revs)
   910             for r, old in changed_revs.items():
   910             if targetphase > draft:
   911                 if old > public:
   911                 for r, old in changed_revs.items():
   912                     sets[old].discard(r)
   912                     if old > public:
       
   913                         sets[old].discard(r)
   913 
   914 
   914         if new_roots:
   915         if new_roots:
   915             assert changed_revs
   916             assert changed_revs
   916 
   917 
   917             final_roots = new_roots | currentroots - replaced_roots
   918             final_roots = new_roots | currentroots - replaced_roots