tests/test-topic-stack-complex.t
branchmercurial-5.0
changeset 5087 5d76b320420e
parent 4777 ff452675566c
parent 4998 88b816a9d990
child 5091 308c1e09f80f
child 5159 e5fe3ca5e6ad
equal deleted inserted replaced
5086:553b2f2fda93 5087:5d76b320420e
    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'?
    73   examine changes to 'c'? [Ynesfdaq?] y
    74   (enter ? for help) [Ynesfdaq?] y
       
    75   
    74   
    76   @@ -0,0 +1,1 @@
    75   @@ -0,0 +1,1 @@
    77   +c
    76   +c
    78   record change 1/2 to 'c'?
    77   record change 1/2 to 'c'? [Ynesfdaq?] y
    79   (enter ? for help) [Ynesfdaq?] y
       
    80   
    78   
    81   diff --git a/d b/d
    79   diff --git a/d b/d
    82   new file mode 100644
    80   new file mode 100644
    83   examine changes to 'd'?
    81   examine changes to 'd'? [Ynesfdaq?] n
    84   (enter ? for help) [Ynesfdaq?] n
       
    85   
    82   
    86   continue splitting? [Ycdq?] c
    83   continue splitting? [Ycdq?] c
    87   1 new orphan changesets
    84   1 new orphan changesets
    88 
    85 
    89   $ hg stack
    86   $ hg stack