Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-simple-update.out @ 1564:34579a67fa71

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 5a034646e472
children 3053fc33f545
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
767
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
1 adding foo
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
2 checking changesets
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
3 checking manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
4 crosschecking files in changesets and manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
5 checking files
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
6 1 files, 1 changesets, 1 total revisions
404
a1ecef497721 [PATCH] Unintuive use
mpm@selenic.com
parents: 350
diff changeset
7 pulling from ../branch
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
8 searching for changes
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
9 adding changesets
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
10 adding manifests
775
122449dd89db Fix up test results
mpm@selenic.com
parents: 767
diff changeset
11 adding file changes
122449dd89db Fix up test results
mpm@selenic.com
parents: 767
diff changeset
12 added 1 changesets with 1 changes to 1 files
404
a1ecef497721 [PATCH] Unintuive use
mpm@selenic.com
parents: 350
diff changeset
13 (run 'hg update' to get a working copy)
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
14 checking changesets
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
15 checking manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
16 crosschecking files in changesets and manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
17 checking files
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
18 1 files, 2 changesets, 2 total revisions
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
19 foo
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
20 bar
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
21 6f4310b00b9a147241b071a60c28a650827fb03d 644 foo