Mercurial > evolve

diff tests/test-prev-next.t @ 3779:084038b98cd7 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
next: bail out early in `hg next --evolve` if dirty wdir This patch adds logic to bail out early when --evolve is passed with next command and the working directory is dirty. This will help us in preventing the message saying `do you want --merge` which is useless and misleading when `--evolve` is passed.
author Pulkit Goyal <7895pulkit@gmail.com>
date Sun, 03 Jun 2018 02:26:19 +0530
parents 1bf0d353f999
children 9da11755d615
line wrap: on
line diff
--- a/tests/test-prev-next.t	Sun Jun 03 02:24:28 2018 +0530
+++ b/tests/test-prev-next.t	Sun Jun 03 02:26:19 2018 +0530
@@ -375,5 +375,4 @@
 
   $ hg next --evolve
   abort: uncommitted changes
-  (do you want --merge?)
   [255]