468 abort: uncommitted changes |
468 abort: uncommitted changes |
469 (do you want --merge?) |
469 (do you want --merge?) |
470 [255] |
470 [255] |
471 $ hg prev --merge --config commands.update.check=abort |
471 $ hg prev --merge --config commands.update.check=abort |
472 file 'bar' was deleted in other [destination] but was modified in local [working copy]. |
472 file 'bar' was deleted in other [destination] but was modified in local [working copy]. |
473 You can use (c)hanged version, (d)elete, or leave (u)nresolved. |
473 What do you want to do? |
474 What do you want to do? |
474 use (c)hanged version, (d)elete, or leave (u)nresolved? |
475 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
475 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
476 use 'hg resolve' to retry unresolved file merges |
476 use 'hg resolve' to retry unresolved file merges |
477 [1] added foo |
477 [1] added foo |
478 |
478 |
479 $ hg revert --all |
479 $ hg revert --all |
532 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
532 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
533 reverting a |
533 reverting a |
534 adding b |
534 adding b |
535 diff --git a/a b/a |
535 diff --git a/a b/a |
536 1 hunks, 1 lines changed |
536 1 hunks, 1 lines changed |
537 examine changes to 'a'? |
537 examine changes to 'a'? [Ynesfdaq?] y |
538 (enter ? for help) [Ynesfdaq?] y |
|
539 |
538 |
540 @@ -1,1 +1,2 @@ |
539 @@ -1,1 +1,2 @@ |
541 firstline |
540 firstline |
542 +secondline |
541 +secondline |
543 record change 1/2 to 'a'? |
542 record change 1/2 to 'a'? [Ynesfdaq?] y |
544 (enter ? for help) [Ynesfdaq?] y |
|
545 |
543 |
546 diff --git a/b b/b |
544 diff --git a/b b/b |
547 new file mode 100644 |
545 new file mode 100644 |
548 examine changes to 'b'? |
546 examine changes to 'b'? [Ynesfdaq?] n |
549 (enter ? for help) [Ynesfdaq?] n |
|
550 |
547 |
551 created new head |
548 created new head |
552 continue splitting? [Ycdq?] Y |
549 continue splitting? [Ycdq?] Y |
553 diff --git a/b b/b |
550 diff --git a/b b/b |
554 new file mode 100644 |
551 new file mode 100644 |
555 examine changes to 'b'? |
552 examine changes to 'b'? [Ynesfdaq?] y |
556 (enter ? for help) [Ynesfdaq?] y |
|
557 |
553 |
558 @@ -0,0 +1,1 @@ |
554 @@ -0,0 +1,1 @@ |
559 +bbbbb |
555 +bbbbb |
560 record this change to 'b'? |
556 record this change to 'b'? [Ynesfdaq?] y |
561 (enter ? for help) [Ynesfdaq?] y |
|
562 |
557 |
563 no more change to split |
558 no more change to split |
564 1 new orphan changesets |
559 1 new orphan changesets |
565 |
560 |
566 $ hg up 3 -q |
561 $ hg up 3 -q |