D6226: rebase: fix bug that prevented dry-run rebases from printing failures
durin42 (Augie Fackler)
phabricator at mercurial-scm.org
Fri Apr 12 13:28:58 EDT 2019
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG1b5cec8b6a1e: rebase: fix bug that prevented dry-run rebases from printing failures (authored by durin42, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6226?vs=14713&id=14716
REVISION DETAIL
https://phab.mercurial-scm.org/D6226
AFFECTED FILES
hgext/rebase.py
tests/test-rebase-dest.t
CHANGE DETAILS
diff --git a/tests/test-rebase-dest.t b/tests/test-rebase-dest.t
--- a/tests/test-rebase-dest.t
+++ b/tests/test-rebase-dest.t
@@ -214,7 +214,7 @@
> |
> Z
> EOS
- abort: no rebase in progress
+ abort: source and destination form a cycle
starting dry-run rebase; repository will not be changed
[255]
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -949,6 +949,9 @@
except error.InMemoryMergeConflictsError:
ui.status(_('hit a merge conflict\n'))
return 1
+ except error.Abort:
+ needsabort = False
+ raise
else:
if confirm:
ui.status(_('rebase completed successfully\n'))
To: durin42, martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list