tests/test-stack-branch.t
changeset 3431 2e703ed1c713
parent 3417 d3a17c67f85c
child 3590 d5adce52cef4
child 4066 1aa5f851d2c0
equal deleted inserted replaced
3430:14fbb847be5a 3431:2e703ed1c713
   107 Case with some of the branch unstable
   107 Case with some of the branch unstable
   108 ------------------------------------
   108 ------------------------------------
   109 
   109 
   110   $ echo bbb > ddd
   110   $ echo bbb > ddd
   111   $ hg commit --amend
   111   $ hg commit --amend
       
   112   2 new orphan changesets
   112   $ hg log -G
   113   $ hg log -G
   113   @  6 foo {} draft c_d
   114   @  6 foo {} draft c_d
   114   |
   115   |
   115   | *  5 foo {} draft c_f
   116   | *  5 foo {} draft c_f
   116   | |
   117   | |
   223 
   224 
   224   $ hg up 'desc(c_d)'
   225   $ hg up 'desc(c_d)'
   225   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   226   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   226   $ echo ccc > ddd
   227   $ echo ccc > ddd
   227   $ hg commit --amend -m 'c_D' 
   228   $ hg commit --amend -m 'c_D' 
       
   229   4 new orphan changesets
   228   $ hg rebase -d . -s 'desc(c_g)'
   230   $ hg rebase -d . -s 'desc(c_g)'
   229   rebasing 9:2ebb6e48ab8a "c_g"
   231   rebasing 9:2ebb6e48ab8a "c_g"
   230   rebasing 10:634f38e27a1d "c_h"
   232   rebasing 10:634f38e27a1d "c_h"
   231   $ hg log -G
   233   $ hg log -G
   232   o  13 foo {} draft c_h
   234   o  13 foo {} draft c_h