Show More
@@ -531,7 +531,7 b' def _pushdiscoveryphase(pushop):' | |||||
531 | if (pushop.ui.configbool('ui', '_usedassubrepo') |
|
531 | if (pushop.ui.configbool('ui', '_usedassubrepo') | |
532 | and remotephases # server supports phases |
|
532 | and remotephases # server supports phases | |
533 | and not pushop.outgoing.missing # no changesets to be pushed |
|
533 | and not pushop.outgoing.missing # no changesets to be pushed | |
534 | and publishing): |
|
534 | and remotephases.get('publishing', False)): | |
535 | # When: |
|
535 | # When: | |
536 | # - this is a subrepo push |
|
536 | # - this is a subrepo push | |
537 | # - and remote support phase |
|
537 | # - and remote support phase | |
@@ -541,7 +541,9 b' def _pushdiscoveryphase(pushop):' | |||||
541 | # We drop the possible phase synchronisation done by |
|
541 | # We drop the possible phase synchronisation done by | |
542 | # courtesy to publish changesets possibly locally draft |
|
542 | # courtesy to publish changesets possibly locally draft | |
543 | # on the remote. |
|
543 | # on the remote. | |
544 | remotephases = {'publishing': 'True'} |
|
544 | pushop.outdatedphases = [] | |
|
545 | pushop.fallbackoutdatedphases = [] | |||
|
546 | return | |||
545 | ana = phases.analyzeremotephases(pushop.repo, |
|
547 | ana = phases.analyzeremotephases(pushop.repo, | |
546 | pushop.fallbackheads, |
|
548 | pushop.fallbackheads, | |
547 | remotephases) |
|
549 | remotephases) |
General Comments 0
You need to be logged in to leave comments.
Login now