view tests/test-revert-flags.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.

  $ "$TESTDIR/hghave" execbit || exit 80

  $ hg init repo
  $ cd repo
  $ echo foo > foo
  $ chmod 644 foo
  $ hg ci -qAm '644'

  $ chmod 755 foo
  $ hg ci -qAm '755'

reverting to rev 0

  $ hg revert -a -r 0
  reverting foo
  $ hg st
  M foo
  $ hg diff --git
  diff --git a/foo b/foo
  old mode 100755
  new mode 100644

  $ cd ..