Mercurial > public > mercurial-scm > hg

diff tests/test-rebase-inmemory.t @ 46180:b7ccdb52e0f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/tests/test-rebase-inmemory.t	Sat Dec 26 18:04:30 2020 +0530
+++ b/tests/test-rebase-inmemory.t	Sat Dec 26 18:26:32 2020 +0530
@@ -342,9 +342,7 @@
   $ hg reb -r . -d '.^' -n
   starting dry-run rebase; repository will not be changed
   nothing to rebase
-  dry-run rebase completed successfully; run without -n/--dry-run to perform this rebase
-  abort: no rebase in progress
-  [20]
+  [1]
 
 Check dryrun gives correct results when there is no conflict in rebasing
   $ hg rebase -s 2 -d 6 -n