##// END OF EJS Templates
update: teach hg to override untracked dir with a tracked file on update...
update: teach hg to override untracked dir with a tracked file on update This is a fix to an old problem when Mercurial got confused by an untracked folder with the same name as one of the files in a commit hg was trying to update to. It is pretty safe to remove this folder if it is empty. Backing up an empty folder seems to go against Mercurial's "don't track dirs" philosophy.

File last commit:

r22046:7a9cbb31 default
r29480:1e4512ea default
Show More
test-revert-flags.t
23 lines | 312 B | text/troff | Tads3Lexer
/ tests / test-revert-flags.t
Matt Mackall
tests: replace exit 80 with #require
r22046 #require execbit
Nicolas Dumazet
tests: unify test-revert-flags
r12110
$ 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
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913
$ cd ..