Mercurial > hg > mercurial-crew-with-dirclash
annotate doc/hgmerge.1.txt @ 1564:34579a67fa71
Re: [PATCH 2 of 3] remove walk warning about nonexistent files
On 11/15/05, Robin Farine <robin.farine@terminus.org> wrote:
> # HG changeset patch
> # User Robin Farine <robin.farine@terminus.org>
> # Node ID ce0a3cc309a8d1e81278ec01a3c61fbb99c691f4
> # Parent feb77e0951e74d75c213e8471f107fdcc124c876
> remove walk warning about nonexistent files
>
> diff -r feb77e0951e7 -r ce0a3cc309a8 mercurial/dirstate.py
> --- a/mercurial/dirstate.py Tue Nov 15 08:42:45 2005 +0100
> +++ b/mercurial/dirstate.py Tue Nov 15 08:59:50 2005 +0100
> @@ -336,9 +336,6 @@
> try:
> st = os.lstat(f)
> except OSError, inst:
> - if ff not in dc: self.ui.warn('%s: %s\n' % (
> - util.pathto(self.getcwd(), ff),
> - inst.strerror))
> continue
> if stat.S_ISDIR(st.st_mode):
> cmp1 = (lambda x, y: cmp(x[1], y[1]))
this break some tests,
a better fix would be to check if ff can be a directory prefix from files in dc
you can try the attached patch.
Benoit
author | Benoit Boissinot <bboissin@gmail.com> |
---|---|
date | Thu, 01 Dec 2005 10:48:29 -0600 |
parents | 3ab6e55ee361 |
children | 345bac2bc4ec |
rev | line source |
---|---|
466 | 1 HGMERGE(1) |
2 ========== | |
3 Matt Mackall <mpm@selenic.com> | |
4 v0.1, 27 May 2005 | |
5 | |
6 NAME | |
7 ---- | |
8 hgmerge - default wrapper to merge files in Mercurial SCM system | |
9 | |
10 SYNOPSIS | |
11 -------- | |
12 'hgmerge' local ancestor remote | |
13 | |
14 DESCRIPTION | |
15 ----------- | |
16 The hgmerge(1) command provides a graphical interface to merge files in the | |
17 Mercurial system. It is a simple wrapper around kdiff3, merge(1) and tkdiff(1), | |
18 or simply diff(1) and patch(1) depending on what is present on the system. | |
19 | |
20 hgmerge(1) is used by the Mercurial SCM if the environment variable HGMERGE is | |
21 not set. | |
22 | |
23 AUTHOR | |
24 ------ | |
25 Written by Vincent Danjean <Vincent.Danjean@free.fr> | |
26 | |
27 SEE ALSO | |
28 -------- | |
29 hg(1) - the command line interface to Mercurial SCM | |
30 | |
31 COPYING | |
32 ------- | |
1341 | 33 Copyright \(C) 2005 Matt Mackall. |
466 | 34 Free use of this software is granted under the terms of the GNU General |
35 Public License (GPL). |