Show More
@@ -904,7 +904,9 def _pushbundle2(pushop): | |||||
904 | raise error.Abort(_('missing support for %s') % exc) |
|
904 | raise error.Abort(_('missing support for %s') % exc) | |
905 | except bundle2.AbortFromPart as exc: |
|
905 | except bundle2.AbortFromPart as exc: | |
906 | pushop.ui.status(_('remote: %s\n') % exc) |
|
906 | pushop.ui.status(_('remote: %s\n') % exc) | |
907 | raise error.Abort(_('push failed on remote'), hint=exc.hint) |
|
907 | if exc.hint is not None: | |
|
908 | pushop.ui.status(_('remote: %s\n') % ('(%s)' % exc.hint)) | |||
|
909 | raise error.Abort(_('push failed on remote')) | |||
908 | except error.PushkeyFailed as exc: |
|
910 | except error.PushkeyFailed as exc: | |
909 | partid = int(exc.partid) |
|
911 | partid = int(exc.partid) | |
910 | if partid not in pushop.pkfailcb: |
|
912 | if partid not in pushop.pkfailcb: |
@@ -518,16 +518,16 Doing the actual push: Abort error | |||||
518 | pushing to ssh://user@dummy/other |
|
518 | pushing to ssh://user@dummy/other | |
519 | searching for changes |
|
519 | searching for changes | |
520 | remote: Abandon ship! |
|
520 | remote: Abandon ship! | |
|
521 | remote: (don't panic) | |||
521 | abort: push failed on remote |
|
522 | abort: push failed on remote | |
522 | (don't panic) |
|
|||
523 | [255] |
|
523 | [255] | |
524 |
|
524 | |||
525 | $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 |
|
525 | $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 | |
526 | pushing to http://localhost:$HGPORT2/ |
|
526 | pushing to http://localhost:$HGPORT2/ | |
527 | searching for changes |
|
527 | searching for changes | |
528 | remote: Abandon ship! |
|
528 | remote: Abandon ship! | |
|
529 | remote: (don't panic) | |||
529 | abort: push failed on remote |
|
530 | abort: push failed on remote | |
530 | (don't panic) |
|
|||
531 | [255] |
|
531 | [255] | |
532 |
|
532 | |||
533 |
|
533 |
General Comments 0
You need to be logged in to leave comments.
Login now