view tests/test-issue1089.t @ 17394:19e4861f9730 stable

tests: merging bookmarked heads

45b5eb2941d0 fixed an error that occured when heads being merged were both
inactive bookmarks. Add a test for that case.

http://mercurial.selenic.com/bts/issue1089

  $ hg init
  $ mkdir a
  $ echo a > a/b
  $ hg ci -Am m
  adding a/b

  $ hg rm a
  removing a/b (glob)
  $ hg ci -m m a

  $ mkdir a b
  $ echo a > a/b
  $ hg ci -Am m
  adding a/b

  $ hg rm a
  removing a/b (glob)
  $ cd b

Relative delete:

  $ hg ci -m m ../a

  $ cd ..