##// END OF EJS Templates
icasefs: make case-folding collision detection as rename aware (issue3370)...
icasefs: make case-folding collision detection as rename aware (issue3370) if the file in target context causes case-folding collision against one in working context, current implementation aborts merging with it, even thouhg collding one (in target) is the file renamed from collided one (in working). this patch uses file copy information to know whether colliding file is renamed from collided one or not: if so, collision between them is ignored. this patch also avoids collision detection between current context and target context, if working context is clean (with --check/-c) or will be clean (with --clean/-C).
FUJIWARA Katsunori -
r16478:cbf2ea2f stable
Show More
Name Size Modified Last Commit Author
/ contrib
hgfixes
hgsh
macosx
plan9
vim
win32
wix
bash_completion Loading ...
buildrpm Loading ...
casesmash.py Loading ...
check-code.py Loading ...
convert-repo Loading ...
debugcmdserver.py Loading ...
debugshell.py Loading ...
dumprevlog Loading ...
hg-ssh Loading ...
hgk Loading ...
hgweb.fcgi Loading ...
hgweb.wsgi Loading ...
logo-droplets.svg Loading ...
memory.py Loading ...
mercurial.el Loading ...
mercurial.spec Loading ...
mergetools.hgrc Loading ...
mq.el Loading ...
perf.py Loading ...
pylintrc Loading ...
python-hook-examples.py Loading ...
sample.hgrc Loading ...
setup3k.py Loading ...
shrink-revlog.py Loading ...
simplemerge Loading ...
tcsh_completion Loading ...
tcsh_completion_build.sh Loading ...
tmplrewrite.py Loading ...
undumprevlog Loading ...
xml.rnc Loading ...
zsh_completion Loading ...