Mercurial > hg

diff mercurial/changegroup.py @ 33406:168ba5c4dfcb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Boris Feld <boris.feld@octobus.net>
date Tue, 11 Jul 2017 04:52:56 +0200
parents 69c4493a54f9
children ae052d04b89e
line wrap: on
line diff
--- 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: