Mercurial > hg
comparison tests/test-rebase-inmemory.t @ 46180:b7ccdb52e0f9
rebase: handle the case when nothing to rebase (dry-run)
In dry-run mode, even when there was no rebase in progress it tried
to abort (for context, at the end of dry-run mode we abort the in-memory
performed rebase) because we were not early checking if there was any rebase
started.
Changes in test file reflect the fixed behavior.
Differential Revision: https://phab.mercurial-scm.org/D9659
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Sat, 26 Dec 2020 18:26:32 +0530 |
| parents | 11f3d4458e3a |
| children | 324c8a299324 |
comparison
equal
deleted
inserted
replaced
| 46179:11f3d4458e3a | 46180:b7ccdb52e0f9 |
|---|---|
| 340 | 340 |
| 341 When nothing to rebase | 341 When nothing to rebase |
| 342 $ hg reb -r . -d '.^' -n | 342 $ hg reb -r . -d '.^' -n |
| 343 starting dry-run rebase; repository will not be changed | 343 starting dry-run rebase; repository will not be changed |
| 344 nothing to rebase | 344 nothing to rebase |
| 345 dry-run rebase completed successfully; run without -n/--dry-run to perform this rebase | 345 [1] |
| 346 abort: no rebase in progress | |
| 347 [20] | |
| 348 | 346 |
| 349 Check dryrun gives correct results when there is no conflict in rebasing | 347 Check dryrun gives correct results when there is no conflict in rebasing |
| 350 $ hg rebase -s 2 -d 6 -n | 348 $ hg rebase -s 2 -d 6 -n |
| 351 starting dry-run rebase; repository will not be changed | 349 starting dry-run rebase; repository will not be changed |
| 352 rebasing 2:177f92b77385 "c" | 350 rebasing 2:177f92b77385 "c" |