Mercurial > hg
diff tests/test-rebase-inmemory.t @ 38499:999e5c218daf
rebase: suppress warning thrown when aborting rebase in case of dryrun
Before this patch dryrun output contained "rebase aborted" every
time we run rebase in dryrun mode and this warning does not sound
safe from a user prespective.
Differential Revision: https://phab.mercurial-scm.org/D3857
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Fri, 29 Jun 2018 01:05:08 +0530 |
parents | c892a30bafb9 |
children | 731debab233f |
line wrap: on
line diff
--- a/tests/test-rebase-inmemory.t Fri Jun 29 00:47:33 2018 +0530 +++ b/tests/test-rebase-inmemory.t Fri Jun 29 01:05:08 2018 +0530 @@ -212,7 +212,6 @@ rebasing 3:055a42cdd887 "d" rebasing 4:e860deea161a "e" there will be no conflict, you can rebase - rebase aborted $ hg diff $ hg status @@ -245,7 +244,6 @@ rebasing 3:055a42cdd887 "d" rebasing 4:e860deea161a "e" there will be no conflict, you can rebase - rebase aborted Check dryrun gives correct results when there is conflict in rebasing Make a conflict: @@ -285,7 +283,6 @@ transaction abort! rollback completed hit a merge conflict - rebase aborted [1] $ hg diff $ hg status @@ -321,5 +318,4 @@ rebasing 4:e860deea161a "e" merging e hit a merge conflict - rebase aborted [1]