tests/test-rebase-cache.t
changeset 25295 701df761aa94
parent 23835 aa4a1672583e
child 33332 3b7cb3d17137
equal deleted inserted replaced
25293:ab618e52788a 25295:701df761aa94
    29 
    29 
    30   $ hg up -q 0
    30   $ hg up -q 0
    31 
    31 
    32   $ hg branch branch2
    32   $ hg branch branch2
    33   marked working directory as branch branch2
    33   marked working directory as branch branch2
    34   (branches are permanent and global, did you want a bookmark?)
       
    35   $ hg ci -m 'branch2'
    34   $ hg ci -m 'branch2'
    36 
    35 
    37   $ echo c > C
    36   $ echo c > C
    38   $ hg ci -Am C
    37   $ hg ci -Am C
    39   adding C
    38   adding C
    40 
    39 
    41   $ hg up -q 2
    40   $ hg up -q 2
    42 
    41 
    43   $ hg branch -f branch2
    42   $ hg branch -f branch2
    44   marked working directory as branch branch2
    43   marked working directory as branch branch2
    45   (branches are permanent and global, did you want a bookmark?)
       
    46   $ echo d > d
    44   $ echo d > d
    47   $ hg ci -Am D
    45   $ hg ci -Am D
    48   adding d
    46   adding d
    49   created new head
    47   created new head
    50 
    48 
    55   $ hg update default
    53   $ hg update default
    56   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
    54   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
    57 
    55 
    58   $ hg branch branch3
    56   $ hg branch branch3
    59   marked working directory as branch branch3
    57   marked working directory as branch branch3
    60   (branches are permanent and global, did you want a bookmark?)
       
    61   $ hg ci -m 'branch3'
    58   $ hg ci -m 'branch3'
    62 
    59 
    63   $ echo f > f
    60   $ echo f > f
    64   $ hg ci -Am F
    61   $ hg ci -Am F
    65   adding f
    62   adding f
   306   (branches are permanent and global, did you want a bookmark?)
   303   (branches are permanent and global, did you want a bookmark?)
   307   $ hg ci -m 'branch1'
   304   $ hg ci -m 'branch1'
   308 
   305 
   309   $ hg branch branch2
   306   $ hg branch branch2
   310   marked working directory as branch branch2
   307   marked working directory as branch branch2
   311   (branches are permanent and global, did you want a bookmark?)
       
   312   $ hg ci -m 'branch2'
   308   $ hg ci -m 'branch2'
   313 
   309 
   314   $ hg branch -f branch1
   310   $ hg branch -f branch1
   315   marked working directory as branch branch1
   311   marked working directory as branch branch1
   316   (branches are permanent and global, did you want a bookmark?)
       
   317 
   312 
   318   $ echo a > A
   313   $ echo a > A
   319   $ hg ci -Am A
   314   $ hg ci -Am A
   320   adding A
   315   adding A
   321   created new head
   316   created new head