##// END OF EJS Templates
Fix file-changed-to-dir and dir-to-file commits (issue660)....
Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory.
Maxim Dounin -
r5487:7a64931e default
Show More
Name Size Modified Last Commit Author
/ mercurial
hgweb
__init__.py Loading ...
ancestor.py Loading ...
archival.py Loading ...
base85.c Loading ...
bdiff.c Loading ...
bundlerepo.py Loading ...
byterange.py Loading ...
changegroup.py Loading ...
changelog.py Loading ...
cmdutil.py Loading ...
commands.py Loading ...
context.py Loading ...
demandimport.py Loading ...
diffhelpers.c Loading ...
dirstate.py Loading ...
dispatch.py Loading ...
extensions.py Loading ...
fancyopts.py Loading ...
filelog.py Loading ...
help.py Loading ...
hg.py Loading ...
hook.py Loading ...
httprangereader.py Loading ...
httprepo.py Loading ...
i18n.py Loading ...
ignore.py Loading ...
keepalive.py Loading ...
localrepo.py Loading ...
lock.py Loading ...
lsprof.py Loading ...
mail.py Loading ...
manifest.py Loading ...
mdiff.py Loading ...
merge.py Loading ...
mpatch.c Loading ...
node.py Loading ...
osutil.c Loading ...
osutil.py Loading ...
patch.py Loading ...
remoterepo.py Loading ...
repair.py Loading ...
repo.py Loading ...
revlog.py Loading ...
sshrepo.py Loading ...
sshserver.py Loading ...
statichttprepo.py Loading ...
streamclone.py Loading ...
strutil.py Loading ...
templater.py Loading ...
transaction.py Loading ...
ui.py Loading ...
util.py Loading ...
util_win32.py Loading ...
verify.py Loading ...
version.py Loading ...