Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-pull.out @ 2021:fc22ed56afe3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix hg push and hg push -r sometimes creating new heads without --force. Fixing issue179. The algorithm checks if there not more new heads on the remote side than heads which become non-heads due to getting children. Pushing this repo: m /\ 3 3a| |/ / 2 2a |/ 1 to a repo only having 1, 2 and 3 didn't abort requiring --force before. Added test cases for this and some doc strings for used methods.
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 29 Mar 2006 22:35:21 +0200
parents 385b06493465
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: 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
775
122449dd89db Fix up test results
mpm@selenic.com
parents: 767
diff changeset
10 adding file changes
122449dd89db Fix up test results
mpm@selenic.com
parents: 767
diff changeset
11 added 1 changesets with 1 changes to 1 files
336
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