##// END OF EJS Templates
dirstate: don't fail when dropping a not-tracked file (issue3080)...
dirstate: don't fail when dropping a not-tracked file (issue3080) Complex merges with divergent renames can cause a file to be 'moved' twice, causing dirstate.drop() to be called twice. Rather than try to ensure there are no unexpected corner cases where this can happen, we simply ignore drops of files that aren't tracked.

File last commit:

r14460:d5f61613 default
r15399:41453d55 2.0 stable
Show More
hgrc.5.txt
41 lines | 793 B | text/plain | TextLexer
======
hgrc
======
---------------------------------
configuration files for Mercurial
---------------------------------
:Author: Bryan O'Sullivan <bos@serpentine.com>
:Organization: Mercurial
:Manual section: 5
:Manual group: Mercurial Manual
.. contents::
:backlinks: top
:class: htmlonly
Synopsis
--------
.. include:: ../mercurial/help/config.txt
Author
------
Bryan O'Sullivan <bos@serpentine.com>.
Mercurial was written by Matt Mackall <mpm@selenic.com>.
See Also
--------
|hg(1)|_, |hgignore(5)|_
Copying
-------
This manual page is copyright 2005 Bryan O'Sullivan.
Mercurial is copyright 2005-2010 Matt Mackall.
Free use of this software is granted under the terms of the GNU General
Public License version 2 or any later version.
.. include:: common.txt