Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-simple-update.out @ 566:b2c9b36bd639

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
repo.changes: fix duplicate changes -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 repo.changes: fix duplicate changes We need to discard the changed and added lists from dirstate.changes before adding to them when comparing manifests. Otherwise something that changed from rev->parent->working dir will appear twice. Bug spotted by Goffredo Baroncelli <kreijack@libero.it> manifest hash: 64c335e2fe6df6d1ce29d0903f16821c7566768f -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxcT3ywK+sNU5EO8RAivLAJ4gqbWfMnt+BdyGac/ZGduy2KbNegCgncPV D4ay6Qw9sIodEPjRebvk3GE= =AZd2 -----END PGP SIGNATURE-----
author mpm@selenic.com
date Fri, 01 Jul 2005 14:34:31 -0800
parents c5705ab9cebd
children 5d6177b72fcc
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
1 + mkdir test
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
2 + cd test
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
3 + echo foo
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
4 + hg init
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
5 + hg addremove
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
6 + hg commit -t 1
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
7 + hg verify
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
8 checking changesets
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
9 checking manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
10 crosschecking files in changesets and manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
11 checking files
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
12 1 files, 1 changesets, 1 total revisions
485
c5705ab9cebd [PATCH] add clone command
mpm@selenic.com
parents: 429
diff changeset
13 + hg clone . ../branch
c5705ab9cebd [PATCH] add clone command
mpm@selenic.com
parents: 429
diff changeset
14 + cd ../branch
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
15 + hg co
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
16 + echo bar
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
17 + hg commit -t 2
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
18 + cd ../test
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
19 + hg pull ../branch
404
a1ecef497721 [PATCH] Unintuive use
mpm@selenic.com
parents: 350
diff changeset
20 pulling from ../branch
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
21 searching for changes
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
22 adding changesets
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
23 adding manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
24 adding file revisions
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
25 modified 1 files, added 1 changesets and 1 new revisions
404
a1ecef497721 [PATCH] Unintuive use
mpm@selenic.com
parents: 350
diff changeset
26 (run 'hg update' to get a working copy)
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
27 + hg verify
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
28 checking changesets
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
29 checking manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
30 crosschecking files in changesets and manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
31 checking files
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
32 1 files, 2 changesets, 2 total revisions
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
33 + hg co
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
34 + cat foo
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
35 foo
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
36 bar
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
37 + hg manifest
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
38 6f4310b00b9a147241b071a60c28a650827fb03d 644 foo