tests/test-topic-stack-complex.t
changeset 4712 e2c548cc83b5
parent 4633 61c2518cd6d2
child 4777 ff452675566c
child 4998 88b816a9d990
equal deleted inserted replaced
4711:88c8ef4d703c 4712:e2c548cc83b5
    68   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
    68   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
    69   adding c
    69   adding c
    70   adding d
    70   adding d
    71   diff --git a/c b/c
    71   diff --git a/c b/c
    72   new file mode 100644
    72   new file mode 100644
    73   examine changes to 'c'? [Ynesfdaq?] y
    73   examine changes to 'c'?
       
    74   (enter ? for help) [Ynesfdaq?] y
    74   
    75   
    75   @@ -0,0 +1,1 @@
    76   @@ -0,0 +1,1 @@
    76   +c
    77   +c
    77   record change 1/2 to 'c'? [Ynesfdaq?] y
    78   record change 1/2 to 'c'?
       
    79   (enter ? for help) [Ynesfdaq?] y
    78   
    80   
    79   diff --git a/d b/d
    81   diff --git a/d b/d
    80   new file mode 100644
    82   new file mode 100644
    81   examine changes to 'd'? [Ynesfdaq?] n
    83   examine changes to 'd'?
       
    84   (enter ? for help) [Ynesfdaq?] n
    82   
    85   
    83   continue splitting? [Ycdq?] c
    86   continue splitting? [Ycdq?] c
    84   1 new orphan changesets
    87   1 new orphan changesets
    85 
    88 
    86   $ hg stack
    89   $ hg stack