Mercurial > hg
comparison tests/test-rebase-dest.t @ 42108:1b5cec8b6a1e
rebase: fix bug that prevented dry-run rebases from printing failures
As far as I can tell it should be fine to unconditionally skip
_prepareabortorcontinue if we're in the process of raising an Abort
here.
Differential Revision: https://phab.mercurial-scm.org/D6226
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Fri, 12 Apr 2019 12:06:13 -0400 |
| parents | 8890fce7c13d |
| children | 77bb38be00ea |
comparison
equal
deleted
inserted
replaced
| 42107:8890fce7c13d | 42108:1b5cec8b6a1e |
|---|---|
| 212 > | | 212 > | |
| 213 > B | 213 > B |
| 214 > | | 214 > | |
| 215 > Z | 215 > Z |
| 216 > EOS | 216 > EOS |
| 217 abort: no rebase in progress | 217 abort: source and destination form a cycle |
| 218 starting dry-run rebase; repository will not be changed | 218 starting dry-run rebase; repository will not be changed |
| 219 [255] | 219 [255] |
| 220 | 220 |
| 221 Switch roots: | 221 Switch roots: |
| 222 | 222 |