tests/test-revert-flags.t
author Siddharth Agarwal <sid0@fb.com>
Wed, 14 Oct 2015 15:01:07 -0700
changeset 26740 f4a27c05c43f
parent 22046 7a9cbb315d84
permissions -rw-r--r--
merge.mergestate: add a generator for driver-resolved files Just like for unresolved files above, we need to be able to tell what files are driver-resolved.

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