Show More
@@ -603,7 +603,8 b' update is a merge ...' | |||||
603 | true.priority=1 |
|
603 | true.priority=1 | |
604 | true.executable=cat |
|
604 | true.executable=cat | |
605 | # hg update -C 1 |
|
605 | # hg update -C 1 | |
606 | $ hg debugsetparent 0 |
|
606 | $ hg update -q 0 | |
|
607 | $ hg revert -q -r 1 . | |||
607 | $ hg update -r 2 |
|
608 | $ hg update -r 2 | |
608 | merging f |
|
609 | merging f | |
609 | revision 1 |
|
610 | revision 1 | |
@@ -628,7 +629,8 b' update should also have --tool' | |||||
628 | true.priority=1 |
|
629 | true.priority=1 | |
629 | true.executable=cat |
|
630 | true.executable=cat | |
630 | # hg update -C 1 |
|
631 | # hg update -C 1 | |
631 | $ hg debugsetparent 0 |
|
632 | $ hg update -q 0 | |
|
633 | $ hg revert -q -r 1 . | |||
632 | $ hg update -r 2 --tool false |
|
634 | $ hg update -r 2 --tool false | |
633 | merging f |
|
635 | merging f | |
634 | merging f failed! |
|
636 | merging f failed! |
General Comments 0
You need to be logged in to leave comments.
Login now