Mercurial > evolve

comparison tests/test-prev-next.t @ 3784:838fc71ddb9c stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
next-prev: replace the error hint to mention about `--merge` flag
author Pulkit Goyal <7895pulkit@gmail.com>
date Sun, 03 Jun 2018 03:21:25 +0530
parents 313484606461
children 25dfa95c37fd
comparison
equal deleted inserted replaced
3783:313484606461 3784:838fc71ddb9c
423 test that we dont end up in merge conflicts 423 test that we dont end up in merge conflicts
424 424
425 $ echo bar > bar 425 $ echo bar > bar
426 $ hg prev 426 $ hg prev
427 abort: conflicting changes 427 abort: conflicting changes
428 (commit or update --clean to discard changes) 428 (do you want --merge?)
429 [255] 429 [255]
430 430
431 $ echo hi > bar 431 $ echo hi > bar
432 $ hg prev 432 $ hg prev
433 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 433 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
435 $ echo bar > bar 435 $ echo bar > bar
436 $ hg add bar 436 $ hg add bar
437 437
438 $ hg next 438 $ hg next
439 abort: conflicting changes 439 abort: conflicting changes
440 (commit or update --clean to discard changes) 440 (do you want --merge?)
441 [255] 441 [255]