Mercurial > hg
comparison tests/test-rebase-inmemory.t @ 46179:11f3d4458e3a
rebase: add test to demonstrate an issue in dry-run
In dry-run mode, the case when there is nothing to rebase
is not handled correctly. Added test show that it try to
abort a rebase while there is no rebase in progress.
This will be fixed in next patch.
Differential Revision: https://phab.mercurial-scm.org/D9658
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Sat, 26 Dec 2020 18:04:30 +0530 |
| parents | 2cf61e66c6d0 |
| children | b7ccdb52e0f9 |
comparison
equal
deleted
inserted
replaced
| 46178:e3d595b7fbaa | 46179:11f3d4458e3a |
|---|---|
| 335 abort: cannot specify both --continue and --dry-run | 335 abort: cannot specify both --continue and --dry-run |
| 336 [10] | 336 [10] |
| 337 $ hg rebase -s 2 -d 6 -n --abort | 337 $ hg rebase -s 2 -d 6 -n --abort |
| 338 abort: cannot specify both --abort and --dry-run | 338 abort: cannot specify both --abort and --dry-run |
| 339 [10] | 339 [10] |
| 340 | |
| 341 When nothing to rebase | |
| 342 $ hg reb -r . -d '.^' -n | |
| 343 starting dry-run rebase; repository will not be changed | |
| 344 nothing to rebase | |
| 345 dry-run rebase completed successfully; run without -n/--dry-run to perform this rebase | |
| 346 abort: no rebase in progress | |
| 347 [20] | |
| 340 | 348 |
| 341 Check dryrun gives correct results when there is no conflict in rebasing | 349 Check dryrun gives correct results when there is no conflict in rebasing |
| 342 $ hg rebase -s 2 -d 6 -n | 350 $ hg rebase -s 2 -d 6 -n |
| 343 starting dry-run rebase; repository will not be changed | 351 starting dry-run rebase; repository will not be changed |
| 344 rebasing 2:177f92b77385 "c" | 352 rebasing 2:177f92b77385 "c" |