tests/test-pull-branch.t
changeset 25295 701df761aa94
parent 17345 4f8054d3171b
child 28030 ca2a0a654f54
equal deleted inserted replaced
25293:ab618e52788a 25295:701df761aa94
    31 
    31 
    32   $ hg up 0
    32   $ hg up 0
    33   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    33   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    34   $ hg branch branchB
    34   $ hg branch branchB
    35   marked working directory as branch branchB
    35   marked working directory as branch branchB
    36   (branches are permanent and global, did you want a bookmark?)
       
    37   $ echo b1 > foo
    36   $ echo b1 > foo
    38   $ hg ci -mb1 # 3
    37   $ hg ci -mb1 # 3
    39 
    38 
    40   $ cd ../tt
    39   $ cd ../tt
    41 
    40 
   139 
   138 
   140   $ hg up 6
   139   $ hg up 6
   141   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   140   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   142   $ hg branch branchC
   141   $ hg branch branchC
   143   marked working directory as branch branchC
   142   marked working directory as branch branchC
   144   (branches are permanent and global, did you want a bookmark?)
       
   145   $ echo b1 > bar
   143   $ echo b1 > bar
   146   $ hg ci -Am "commit on branchC on tt"
   144   $ hg ci -Am "commit on branchC on tt"
   147   adding bar
   145   adding bar
   148 
   146 
   149 Make changes on default branch on t
   147 Make changes on default branch on t