##// 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:

r20622:352abbb0 default
r29480:1e4512ea default
Show More
linux-vfat
27 lines | 443 B | text/plain | TextLexer
# invalid filenames
test-add.t
test-init.t
test-clone.t
test-contrib.t
test-hgweb-raw.t
test-walk.t
# no sockets or fifos
test-hup.t
# no hardlinks
test-hardlinks.t
test-relink.t
# exec bit problems
test-convert-bzr-114.t
test-convert-bzr-directories.t
test-convert-bzr-merges.t
test-convert-bzr-treeroot.t
test-convert-darcs.t
test-merge-tools.t
# debugstate exec bit false positives
test-dirstate.t
test-filebranch.t
test-merge-remove.t