Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-pull.out @ 768:20e95c245bc3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix local file changes being ignored after non-branch merge Bug introduced in eea96285cbf9 Spotted by TAH
author mpm@selenic.com
date Sat, 23 Jul 2005 10:00:56 -0500
parents 61ed30e82b27
children 122449dd89db 445970ccf57a
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: 642
diff changeset
1 adding foo
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
2 checking changesets
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
3 checking manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
4 crosschecking files in changesets and manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
5 checking files
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
6 1 files, 1 changesets, 1 total revisions
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
7 requesting all changes
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
8 adding changesets
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
9 adding manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
10 adding file revisions
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
11 modified 1 files, added 1 changesets and 1 new revisions
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
12 checking changesets
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
13 checking manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
14 crosschecking files in changesets and manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
15 checking files
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
16 1 files, 1 changesets, 1 total revisions
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
17 foo
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
18 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo
522
2f1de824798a Fix empty pull bug that appeared this morning
mpm@selenic.com
parents: 350
diff changeset
19 pulling from http://localhost:20059/
2f1de824798a Fix empty pull bug that appeared this morning
mpm@selenic.com
parents: 350
diff changeset
20 searching for changes
2f1de824798a Fix empty pull bug that appeared this morning
mpm@selenic.com
parents: 350
diff changeset
21 no changes found
642
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents: 591
diff changeset
22 killed!