tests/test-topic-stack-complex.t
branchmercurial-5.0
changeset 5280 90fbbc29b93a
parent 5159 e5fe3ca5e6ad
child 5163 1752a2e7a226
child 5364 be5aa681c122
equal deleted inserted replaced
5279:35e769c9604f 5280:90fbbc29b93a
    69   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
    69   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
    70   adding c
    70   adding c
    71   adding d
    71   adding d
    72   diff --git a/c b/c
    72   diff --git a/c b/c
    73   new file mode 100644
    73   new file mode 100644
    74   examine changes to 'c'?
    74   examine changes to 'c'? [Ynesfdaq?] y
    75   (enter ? for help) [Ynesfdaq?] y
       
    76   
    75   
    77   @@ -0,0 +1,1 @@
    76   @@ -0,0 +1,1 @@
    78   +c
    77   +c
    79   record change 1/2 to 'c'?
    78   record change 1/2 to 'c'? [Ynesfdaq?] y
    80   (enter ? for help) [Ynesfdaq?] y
       
    81   
    79   
    82   diff --git a/d b/d
    80   diff --git a/d b/d
    83   new file mode 100644
    81   new file mode 100644
    84   examine changes to 'd'?
    82   examine changes to 'd'? [Ynesfdaq?] n
    85   (enter ? for help) [Ynesfdaq?] n
       
    86   
    83   
    87   continue splitting? [Ycdq?] c
    84   continue splitting? [Ycdq?] c
    88   1 new orphan changesets
    85   1 new orphan changesets
    89 
    86 
    90   $ hg stack
    87   $ hg stack