view tests/test-revert-flags.t @ 46160:1d6aac94e6d5

copies: explain the "arbitrary" copy source pick in case of conflict They are a logic and it is easy to explain, so lets explain it. Differential Revision: https://phab.mercurial-scm.org/D9586
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sun, 13 Dec 2020 19:18:10 +0100
parents 7a9cbb315d84
children
line wrap: on
line source

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