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'? [Ynesfdaq?] y |
537 examine changes to 'a'? |
|
538 (enter ? for help) [Ynesfdaq?] y |
538 |
539 |
539 @@ -1,1 +1,2 @@ |
540 @@ -1,1 +1,2 @@ |
540 firstline |
541 firstline |
541 +secondline |
542 +secondline |
542 record change 1/2 to 'a'? [Ynesfdaq?] y |
543 record change 1/2 to 'a'? |
|
544 (enter ? for help) [Ynesfdaq?] y |
543 |
545 |
544 diff --git a/b b/b |
546 diff --git a/b b/b |
545 new file mode 100644 |
547 new file mode 100644 |
546 examine changes to 'b'? [Ynesfdaq?] n |
548 examine changes to 'b'? |
|
549 (enter ? for help) [Ynesfdaq?] n |
547 |
550 |
548 created new head |
551 created new head |
549 continue splitting? [Ycdq?] Y |
552 continue splitting? [Ycdq?] Y |
550 diff --git a/b b/b |
553 diff --git a/b b/b |
551 new file mode 100644 |
554 new file mode 100644 |
552 examine changes to 'b'? [Ynesfdaq?] y |
555 examine changes to 'b'? |
|
556 (enter ? for help) [Ynesfdaq?] y |
553 |
557 |
554 @@ -0,0 +1,1 @@ |
558 @@ -0,0 +1,1 @@ |
555 +bbbbb |
559 +bbbbb |
556 record this change to 'b'? [Ynesfdaq?] y |
560 record this change to 'b'? |
|
561 (enter ? for help) [Ynesfdaq?] y |
557 |
562 |
558 no more change to split |
563 no more change to split |
559 1 new orphan changesets |
564 1 new orphan changesets |
560 |
565 |
561 $ hg up 3 -q |
566 $ hg up 3 -q |