tests/test-topic-stack-complex.t
branchmercurial-4.4
changeset 4173 e268f7fd7839
parent 4076 f9a850018daa
parent 4161 3c28f8a3a5a5
child 4174 e07e764c0f48
child 4206 04aeaec6ec07
equal deleted inserted replaced
4172:35c21ab64420 4173:e268f7fd7839
    79   diff --git a/d b/d
    79   diff --git a/d b/d
    80   new file mode 100644
    80   new file mode 100644
    81   examine changes to 'd'? [Ynesfdaq?] n
    81   examine changes to 'd'? [Ynesfdaq?] n
    82   
    82   
    83   Done splitting? [yN] y
    83   Done splitting? [yN] y
    84   1 new orphan changesets
       
    85 
    84 
    86   $ hg stack
    85   $ hg stack
    87   ### topic: foo
    86   ### topic: foo
    88   ### target: default (branch)
    87   ### target: default (branch)
    89   s4$ Added e and f (unstable)
    88   s4$ Added e and f (unstable)
    93   s0^ Added foo (base)
    92   s0^ Added foo (base)
    94 
    93 
    95   $ hg show work
    94   $ hg show work
    96   @  5cce (foo) split2
    95   @  5cce (foo) split2
    97   o  f26c (foo) split1
    96   o  f26c (foo) split1
    98   | *  f1d3 (foo) Added e and f
    97   | o  f1d3 (foo) Added e and f
    99   | x  8e82 (foo) Added c and d
    98   | x  8e82 (foo) Added c and d
   100   |/
    99   |/
   101   o  002b (foo) Added a and b
   100   o  002b (foo) Added a and b
   102   o  f360 Added foo
   101   o  f360 Added foo
   103 
   102 
   115 
   114 
   116   $ hg amend
   115   $ hg amend
   117   1 new orphan changesets
   116   1 new orphan changesets
   118   $ hg show work
   117   $ hg show work
   119   @  7d94 (foo) split1
   118   @  7d94 (foo) split1
   120   | *  5cce (foo) split2
   119   | o  5cce (foo) split2
   121   | x  f26c (foo) split1
   120   | x  f26c (foo) split1
   122   |/
   121   |/
   123   | *  f1d3 (foo) Added e and f
   122   | o  f1d3 (foo) Added e and f
   124   | x  8e82 (foo) Added c and d
   123   | x  8e82 (foo) Added c and d
   125   |/
   124   |/
   126   o  002b (foo) Added a and b
   125   o  002b (foo) Added a and b
   127   o  f360 Added foo
   126   o  f360 Added foo
   128 
   127