Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-flags @ 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 | 0902ffece4b4 |
children | 7d83a351a936 |
rev | line source |
---|---|
800
ec85f9e6f3b1
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
1 #!/bin/sh -e |
412 | 2 |
491
66eb9905d0a2
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
440
diff
changeset
|
3 umask 027 |
412 | 4 mkdir test1 |
5 cd test1 | |
6 | |
7 hg init | |
8 touch a b | |
9 hg add a b | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
591
diff
changeset
|
10 hg ci -m "added a b" -d "0 0" |
412 | 11 |
12 cd .. | |
13 mkdir test2 | |
14 cd test2 | |
15 | |
16 hg init | |
440 | 17 hg pull ../test1 |
412 | 18 hg co |
19 chmod +x a | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
591
diff
changeset
|
20 hg ci -m "chmod +x a" -d "0 0" |
412 | 21 |
22 cd ../test1 | |
23 echo 123 >>a | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
591
diff
changeset
|
24 hg ci -m "a updated" -d "0 0" |
412 | 25 |
440 | 26 hg pull ../test2 |
412 | 27 hg heads |
28 hg history | |
29 | |
591 | 30 hg -v co -m |
412 | 31 |
32 ls -l ../test[12]/a > foo | |
33 cut -b 0-10 < foo | |
34 |