tests/test-rebase-inmemory.t
changeset 42345 313812cbf4ca
parent 42344 70845eb656a9
child 42534 4a6826868625
equal deleted inserted replaced
42344:70845eb656a9 42345:313812cbf4ca
   793   $ hg mv a b
   793   $ hg mv a b
   794   $ hg ci -m 'rename a to b'
   794   $ hg ci -m 'rename a to b'
   795   $ hg co -q 0
   795   $ hg co -q 0
   796   $ echo a2 > a
   796   $ echo a2 > a
   797   $ hg ci -qm 'modify a'
   797   $ hg ci -qm 'modify a'
   798 BROKEN: obviously...
       
   799   $ hg rebase -r . -d 1 --collapse
   798   $ hg rebase -r . -d 1 --collapse
   800   rebasing 2:41c4ea50d4cf "modify a" (tip)
   799   rebasing 2:41c4ea50d4cf "modify a" (tip)
   801   merging b and a to b
   800   merging b and a to b
   802   abort: a@b977edf6f839: not found in manifest!
   801   saved backup bundle to $TESTTMP/rebase-rename-collapse/.hg/strip-backup/41c4ea50d4cf-b90b7994-rebase.hg
   803   [255]
       
   804   $ cd ..
   802   $ cd ..
   805 
   803 
   806 Test rebasing when the file we are merging in destination is empty
   804 Test rebasing when the file we are merging in destination is empty
   807 
   805 
   808   $ hg init test
   806   $ hg init test