Mercurial > hg
view doc/hgrc.5.txt @ 15894:44fa047cef57
merge: report all files in _checkunknown
When doing hg up, if there is a file conflict with untracked files,
currently only the first such conflict is reported. With this patch,
all of them are listed.
With this patch error message is now reported as
a: untracked file differs
b: untracked file differs
abort: untracked files in working directory conflict with files in
requested revision
instead of
abort: untracked file in working directory differs from file in
requested revision: 'a'
This is a follow up to an old attempt to do this here:
http://selenic.com/pipermail/mercurial-devel/2011-August/033625.html
| author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
|---|---|
| date | Wed, 11 Jan 2012 15:53:42 -0500 |
| parents | d5f616132c10 |
| children | e49e039acd5e |
line wrap: on
line source
====== 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