Mercurial > hg > mercurial-crew-with-dirclash
annotate MANIFEST.in @ 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 | a0ce13606208 |
children | ea8345a7a29d |
rev | line source |
---|---|
7 | 1 include hg |
2 recursive-include mercurial *.py | |
954 | 3 include hgweb.cgi hgwebdir.cgi |
589 | 4 include hgeditor rewrite-log |
807
5e779f96edb0
Include tests (or possibly maps) ending in numbers in MANIFEST, too.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
806
diff
changeset
|
5 include tests/README tests/run-tests tests/test-*[a-z0-9] tests/*.out |
805
ec7107c5d8ad
Drop .err files generated by failed tests from the MANIFEST.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
740
diff
changeset
|
6 prune tests/*.err |
7 | 7 include *.txt |
807
5e779f96edb0
Include tests (or possibly maps) ending in numbers in MANIFEST, too.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
806
diff
changeset
|
8 include templates/map templates/map-*[a-z0-9] |
188 | 9 include templates/*.tmpl |
1007
2e8d96e89dfc
Include generated documentation in MANIFEST.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
981
diff
changeset
|
10 include doc/README doc/Makefile doc/*.txt doc/*.html doc/*.[0-9] |
673
8e518e11f6cf
Change MANIFEST.in to recursive-include the contrib/ folder.
Andrew Thompson <andrewkt@aktzero.com>
parents:
589
diff
changeset
|
11 recursive-include contrib * |
7 | 12 include README |
589 | 13 include CONTRIBUTORS |
14 include COPYING | |
1021 | 15 include Makefile |
589 | 16 include MANIFEST.in |