Show More
@@ -305,6 +305,20 b' def _pushdiscoveryphase(pushop):' | |||||
305 | unfi = pushop.repo.unfiltered() |
|
305 | unfi = pushop.repo.unfiltered() | |
306 | remotephases = pushop.remote.listkeys('phases') |
|
306 | remotephases = pushop.remote.listkeys('phases') | |
307 | publishing = remotephases.get('publishing', False) |
|
307 | publishing = remotephases.get('publishing', False) | |
|
308 | if (pushop.ui.configbool('ui', '_usedassubrepo', False) | |||
|
309 | and remotephases # server supports phases | |||
|
310 | and not pushop.outgoing.missing # no changesets to be pushed | |||
|
311 | and publishing): | |||
|
312 | # When: | |||
|
313 | # - this is a subrepo push | |||
|
314 | # - and remote support phase | |||
|
315 | # - and no changeset are to be pushed | |||
|
316 | # - and remote is publishing | |||
|
317 | # We may be in issue 3871 case! | |||
|
318 | # We drop the possible phase synchronisation done by | |||
|
319 | # courtesy to publish changesets possibly locally draft | |||
|
320 | # on the remote. | |||
|
321 | remotephases = {'publishing': 'True'} | |||
308 | ana = phases.analyzeremotephases(pushop.repo, |
|
322 | ana = phases.analyzeremotephases(pushop.repo, | |
309 | pushop.fallbackheads, |
|
323 | pushop.fallbackheads, | |
310 | remotephases) |
|
324 | remotephases) |
@@ -1490,7 +1490,17 b' Courtesy phases synchronisation to publi' | |||||
1490 | > [paths] |
|
1490 | > [paths] | |
1491 | > default=../issue3781-dest/ |
|
1491 | > default=../issue3781-dest/ | |
1492 | > EOF |
|
1492 | > EOF | |
1493 | $ hg push |
|
1493 | $ hg push --config experimental.bundle2-exp=False | |
|
1494 | pushing to $TESTTMP/issue3781-dest (glob) | |||
|
1495 | pushing subrepo s to $TESTTMP/issue3781-dest/s | |||
|
1496 | searching for changes | |||
|
1497 | no changes found | |||
|
1498 | searching for changes | |||
|
1499 | no changes found | |||
|
1500 | [1] | |||
|
1501 | # clean the push cache | |||
|
1502 | $ rm s/.hg/cache/storehash/* | |||
|
1503 | $ hg push --config experimental.bundle2-exp=True | |||
1494 | pushing to $TESTTMP/issue3781-dest (glob) |
|
1504 | pushing to $TESTTMP/issue3781-dest (glob) | |
1495 | pushing subrepo s to $TESTTMP/issue3781-dest/s |
|
1505 | pushing subrepo s to $TESTTMP/issue3781-dest/s | |
1496 | searching for changes |
|
1506 | searching for changes |
General Comments 0
You need to be logged in to leave comments.
Login now