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

r27925:f6d73c87 stable
r29480:1e4512ea default
Show More
hgignore.5.txt
34 lines | 716 B | text/plain | TextLexer
Takumi IINO
doc: make man and html from translated documents...
r19426 ==========
hgignore
==========
---------------------------------
syntax for Mercurial ignore files
---------------------------------
:Author: Vadim Gelfer <vadim.gelfer@gmail.com>
:Organization: Mercurial
:Manual section: 5
:Manual group: Mercurial Manual
.. include:: hgignore.5.gendoc.txt
Author
======
Vadim Gelfer <vadim.gelfer@gmail.com>
Mercurial was written by Matt Mackall <mpm@selenic.com>.
See Also
========
|hg(1)|_, |hgrc(5)|_
Copying
=======
This manual page is copyright 2006 Vadim Gelfer.
timeless
copyright: update to 2016
r27925 Mercurial is copyright 2005-2016 Matt Mackall.
Takumi IINO
doc: make man and html from translated documents...
r19426 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