Show More
@@ -858,6 +858,8 b' def unbundle(repo, proto, heads):' | |||||
858 | return pusherr(str(exc)) |
|
858 | return pusherr(str(exc)) | |
859 |
|
859 | |||
860 | bundler = bundle2.bundle20(repo.ui) |
|
860 | bundler = bundle2.bundle20(repo.ui) | |
|
861 | for out in getattr(exc, '_bundle2salvagedoutput', ()): | |||
|
862 | bundler.addpart(out) | |||
861 | try: |
|
863 | try: | |
862 | raise |
|
864 | raise | |
863 | except error.BundleValueError, exc: |
|
865 | except error.BundleValueError, exc: |
@@ -567,6 +567,10 b' Doing the actual push: hook abort' | |||||
567 | $ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 |
|
567 | $ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 | |
568 | pushing to ssh://user@dummy/other |
|
568 | pushing to ssh://user@dummy/other | |
569 | searching for changes |
|
569 | searching for changes | |
|
570 | remote: adding changesets | |||
|
571 | remote: adding manifests | |||
|
572 | remote: adding file changes | |||
|
573 | remote: added 1 changesets with 1 changes to 1 files | |||
570 | abort: pretxnclose.failpush hook exited with status 1 |
|
574 | abort: pretxnclose.failpush hook exited with status 1 | |
571 | remote: pre-close-tip:e7ec4e813ba6 draft |
|
575 | remote: pre-close-tip:e7ec4e813ba6 draft | |
572 | remote: transaction abort! |
|
576 | remote: transaction abort! | |
@@ -576,6 +580,10 b' Doing the actual push: hook abort' | |||||
576 | $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 |
|
580 | $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 | |
577 | pushing to http://localhost:$HGPORT2/ |
|
581 | pushing to http://localhost:$HGPORT2/ | |
578 | searching for changes |
|
582 | searching for changes | |
|
583 | remote: adding changesets | |||
|
584 | remote: adding manifests | |||
|
585 | remote: adding file changes | |||
|
586 | remote: added 1 changesets with 1 changes to 1 files | |||
579 | abort: pretxnclose.failpush hook exited with status 1 |
|
587 | abort: pretxnclose.failpush hook exited with status 1 | |
580 | [255] |
|
588 | [255] | |
581 |
|
589 |
General Comments 0
You need to be logged in to leave comments.
Login now