# HG changeset patch # User Boris Feld # Date 1499741576 -7200 # Node ID 168ba5c4dfcbe076747986a4d7305e0c93e5a9a7 # Parent 6aa643762641b32f91b635be9aa81372503cabfa changegroup: stop treating strip as special when dealing with phases Since 8e3021fd1a44, the strip bundle includes the phases of the stripping node. Hence we don't need this special case anymore. Dropping it will helps make the phase behavior more consistent across all exchanges medium. diff -r 6aa643762641 -r 168ba5c4dfcb mercurial/changegroup.py --- a/mercurial/changegroup.py Tue Jul 11 09:42:32 2017 -0700 +++ b/mercurial/changegroup.py Tue Jul 11 04:52:56 2017 +0200 @@ -372,10 +372,7 @@ # ignored. phases.advanceboundary(repo, tr, phases.draft, cgnodes) phases.retractboundary(repo, tr, phases.draft, added) - elif srctype != 'strip': - # publishing only alter behavior during push - # - # strip should not touch boundary at all + else: phases.retractboundary(repo, tr, targetphase, added) if changesets > 0: