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.
#
# tcsh completion for Mercurial
#
# This file has been auto-generated by tcsh_completion_build.sh for
# Mercurial Distributed SCM (version 325c07fd2ebd)
#
# Copyright (C) 2005 TK Soh.
#
# This is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free
# Software Foundation; either version 2 of the License, or (at your
# option) any later version.
#
complete hg \
'n/--cwd/d/' 'n/-R/d/' 'n/--repository/d/' \
'C/-/( -R --repository \
--cwd \
-y --noninteractive \
-q --quiet \
-v --verbose \
--debug \
--debugger \
--traceback \
--time \
--profile \
--version \
-h --help)/' \
'p/1/(add addremove annotate bundle cat \
clone commit ci copy cp \
debugancestor debugcheckstate debugconfig debugdata debugindex \
debugindexdot debugrename debugstate debugwalk diff \
export forget grep heads help \
identify id import patch incoming \
in init locate log history \
manifest outgoing out parents paths \
pull push rawcommit recover remove \
rm rename mv revert root \
serve status tag tags tip \
unbundle undo update up checkout \
co verify version)/'