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

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
comparison
equal deleted inserted replaced
3778:1bf0d353f999 3779:084038b98cd7
373 373
374 $ echo babar > bar 374 $ echo babar > bar
375 375
376 $ hg next --evolve 376 $ hg next --evolve
377 abort: uncommitted changes 377 abort: uncommitted changes
378 (do you want --merge?)
379 [255] 378 [255]