Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-pull.out @ 576:da11baf5de7b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Handle unknown files better on update -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Handle unknown files better on update If we spot an unknown file that's identical to one that's in the update, we get the updated one so that it shows up in the dirstate properly. manifest hash: 988aca64f255df67c27d1c6f8694ea098e4ec159 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxyFyywK+sNU5EO8RAjmiAKCTgINXMPB1CxHt0OgHYPucfjCS7QCcDpJJ VgKqZS54hTAWN3jL2yllUhI= =iPQD -----END PGP SIGNATURE-----
author mpm@selenic.com
date Sat, 02 Jul 2005 15:21:22 -0800
parents 2f1de824798a
children eb46971fc57f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
1 checking changesets
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
2 checking manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
3 crosschecking files in changesets and manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
4 checking files
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
5 1 files, 1 changesets, 1 total revisions
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
6 requesting all changes
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
7 adding changesets
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
8 adding manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
9 adding file revisions
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
10 modified 1 files, added 1 changesets and 1 new revisions
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
11 checking changesets
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
12 checking manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
13 crosschecking files in changesets and manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
14 checking files
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
15 1 files, 1 changesets, 1 total revisions
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
16 foo
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
17 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo
522
2f1de824798a Fix empty pull bug that appeared this morning
mpm@selenic.com
parents: 350
diff changeset
18 pulling from http://localhost:20059/
2f1de824798a Fix empty pull bug that appeared this morning
mpm@selenic.com
parents: 350
diff changeset
19 searching for changes
2f1de824798a Fix empty pull bug that appeared this morning
mpm@selenic.com
parents: 350
diff changeset
20 no changes found
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
21 killed!