Mercurial > hg
comparison tests/test-resolve.t @ 38874:f35f6791595f
resolve: support confirm config option with --unmark flag
Now, commands.resolve.confirm also respect --unmark option; and
confirm to unresolve all resolved files.
It will confirm only when no files pats are passed (same as --mark),
because when no pats are passed the default is to mark resolved files
as unresolved.
And if user has passed file pats then I think there is no need to confirm
for that.
Differential Revision: https://phab.mercurial-scm.org/D4102
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Sat, 04 Aug 2018 12:43:41 +0530 |
parents | 7e75777e4a51 |
children | 5d00e6061ba2 |
comparison
equal
deleted
inserted
replaced
38873:7e75777e4a51 | 38874:f35f6791595f |
---|---|
555 $ hg resolve -l | 555 $ hg resolve -l |
556 R emp1 | 556 R emp1 |
557 R emp2 | 557 R emp2 |
558 R emp3 | 558 R emp3 |
559 | 559 |
560 Test that commands.resolve.confirm respect --unmark option (only when no patterns args are given): | |
561 =============================================================================================== | |
562 | |
563 $ hg resolve -u emp1 | |
564 | |
565 $ hg resolve -l | |
566 U emp1 | |
567 R emp2 | |
568 R emp3 | |
569 | |
570 $ hg resolve -u << EOF | |
571 > n | |
572 > EOF | |
573 mark all resolved files as unresolved (yn)? n | |
574 abort: user quit | |
575 [255] | |
576 | |
577 $ hg resolve -m << EOF | |
578 > y | |
579 > EOF | |
580 mark all unresolved files as resolved (yn)? y | |
581 (no more unresolved files) | |
582 continue: hg rebase --continue | |
583 | |
584 $ hg resolve -l | |
585 R emp1 | |
586 R emp2 | |
587 R emp3 | |
588 | |
560 $ hg rebase --abort | 589 $ hg rebase --abort |
561 rebase aborted | 590 rebase aborted |
562 $ cd .. | 591 $ cd .. |