Mercurial > hg
annotate doc/common.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 | 2399362b3bb0 |
children |
rev | line source |
---|---|
9162
2399362b3bb0
doc: link man pages to one another
Martin Geisler <mg@lazybytes.net>
parents:
diff
changeset
|
1 .. Common link and substitution definitions. |
2399362b3bb0
doc: link man pages to one another
Martin Geisler <mg@lazybytes.net>
parents:
diff
changeset
|
2 |
2399362b3bb0
doc: link man pages to one another
Martin Geisler <mg@lazybytes.net>
parents:
diff
changeset
|
3 .. |hg(1)| replace:: **hg**\ (1) |
2399362b3bb0
doc: link man pages to one another
Martin Geisler <mg@lazybytes.net>
parents:
diff
changeset
|
4 .. _hg(1): hg.1.html |
2399362b3bb0
doc: link man pages to one another
Martin Geisler <mg@lazybytes.net>
parents:
diff
changeset
|
5 .. |hgrc(5)| replace:: **hgrc**\ (5) |
2399362b3bb0
doc: link man pages to one another
Martin Geisler <mg@lazybytes.net>
parents:
diff
changeset
|
6 .. _hgrc(5): hgrc.5.html |
2399362b3bb0
doc: link man pages to one another
Martin Geisler <mg@lazybytes.net>
parents:
diff
changeset
|
7 .. |hgignore(5)| replace:: **hgignore**\ (5) |
2399362b3bb0
doc: link man pages to one another
Martin Geisler <mg@lazybytes.net>
parents:
diff
changeset
|
8 .. _hgignore(5): hgignore.5.html |