view tests/test-revert-flags.t @ 26893:19c4b93cb7d6

filemerge: move :merge-local/other symlink check to precheck

In upcoming patches we're going to add more checks to the function currently
named _symlinkcheck. This consolidates all those checks.

#require execbit

  $ 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 ..