Mercurial > hg
annotate tests/test-unrelated-pull.t @ 13742:7abab875e647
discovery: avoid discovery when local graph is a subset of remote
Immediately sends local's heads to the server to check whether the server knows them all.
If it does, we can call getbundle immediately.
Interesting test output changes are:
- added 1 changesets with 0 changes to 1 files (+1 heads)
+ added 1 changesets with 0 changes to 0 files (+1 heads)
-> The new getbundle() actually fixes a bug vs. changegroupsubset() in that it no longer
returns unnecessary files when file revs are reused.
warning: repository is unrelated
+ requesting all changes
-> The new use of common instead of bases correctly indicates that an unrelated pull
gets all changes from the server.
author | Peter Arrenbrecht <peter.arrenbrecht@gmail.com> |
---|---|
date | Wed, 23 Mar 2011 16:06:55 +0100 |
parents | 4134686b83e1 |
children | ffb5c09ba822 |
rev | line source |
---|---|
12279 | 1 $ mkdir a |
2 $ cd a | |
3 $ hg init | |
4 $ echo 123 > a | |
5 $ hg add a | |
6 $ hg commit -m "a" -u a | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
579
diff
changeset
|
7 |
12279 | 8 $ cd .. |
9 $ mkdir b | |
10 $ cd b | |
11 $ hg init | |
12 $ echo 321 > b | |
13 $ hg add b | |
14 $ hg commit -m "b" -u b | |
15 | |
16 $ hg pull ../a | |
17 pulling from ../a | |
18 searching for changes | |
19 abort: repository is unrelated | |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12279
diff
changeset
|
20 [255] |
579
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff
changeset
|
21 |
12279 | 22 $ hg pull -f ../a |
23 pulling from ../a | |
24 searching for changes | |
25 warning: repository is unrelated | |
13742
7abab875e647
discovery: avoid discovery when local graph is a subset of remote
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
12316
diff
changeset
|
26 requesting all changes |
12279 | 27 adding changesets |
28 adding manifests | |
29 adding file changes | |
30 added 1 changesets with 1 changes to 1 files (+1 heads) | |
31 (run 'hg heads' to see heads, 'hg merge' to merge) | |
579
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff
changeset
|
32 |
12279 | 33 $ hg heads |
34 changeset: 1:9a79c33a9db3 | |
35 tag: tip | |
36 parent: -1:000000000000 | |
37 user: a | |
38 date: Thu Jan 01 00:00:00 1970 +0000 | |
39 summary: a | |
40 | |
41 changeset: 0:01f8062b2de5 | |
42 user: b | |
43 date: Thu Jan 01 00:00:00 1970 +0000 | |
44 summary: b | |
45 |