tests/test-rename-after-merge
changeset 5608 784eadabd985
parent 5318 c6682cdada2f
child 7689 d821ea464465
equal deleted inserted replaced
5607:e9bae5c80ab4 5608:784eadabd985
    22 hg ci -m a2
    22 hg ci -m a2
    23 
    23 
    24 echo % merge repositories
    24 echo % merge repositories
    25 hg pull ../t2
    25 hg pull ../t2
    26 hg merge
    26 hg merge
       
    27 hg st
    27 
    28 
    28 echo % rename b as c
    29 echo % rename b as c
    29 hg mv b c
    30 hg mv b c
    30 hg st
    31 hg st
    31 echo % rename back c as b
    32 echo % rename back c as b