Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-undo @ 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 | 7544700fd931 |
| rev | line source |
|---|---|
|
544
3d4d5f2aba9a
Remove bashisms and use /bin/sh instead of /bin/bash.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
350
diff
changeset
|
1 #!/bin/sh |
| 336 | 2 |
| 3 mkdir t | |
| 4 cd t | |
| 5 hg init | |
| 6 echo a > a | |
| 7 hg add a | |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
547
diff
changeset
|
8 hg commit -m "test" -d "0 0" |
| 336 | 9 hg verify |
| 10 hg parents | |
| 11 hg status | |
| 12 hg undo | |
| 13 hg verify | |
| 14 hg parents | |
| 15 hg status |