Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-up-local-change @ 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 | 4f81068ed8cd |
children | db10b7114de0 |
rev | line source |
---|---|
544
3d4d5f2aba9a
Remove bashisms and use /bin/sh instead of /bin/bash.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
485
diff
changeset
|
1 #!/bin/sh |
331 | 2 |
800
ec85f9e6f3b1
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
793
diff
changeset
|
3 set -e |
331 | 4 mkdir r1 |
5 cd r1 | |
6 hg init | |
7 echo a > a | |
8 hg addremove | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
591
diff
changeset
|
9 hg commit -m "1" -d "0 0" |
331 | 10 |
485 | 11 hg clone . ../r2 |
12 cd ../r2 | |
331 | 13 hg up |
14 echo abc > a | |
949 | 15 hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
16 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" | |
331 | 17 |
18 cd ../r1 | |
19 echo b > b | |
20 echo a2 > a | |
21 hg addremove | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
591
diff
changeset
|
22 hg commit -m "2" -d "0 0" |
331 | 23 |
24 cd ../r2 | |
25 hg -q pull ../r1 | |
26 hg status | |
591 | 27 hg --debug up |
28 hg --debug up -m | |
331 | 29 hg parents |
30 hg -v history | |
949 | 31 hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
32 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" | |
331 | 33 |