Mercurial > hg
annotate tests/test-treediscovery.t @ 28945:05982f7ab231
py3: use absolute_import in revlog-formatv0.py
author | Robert Stanca <robert.stanca7@gmail.com> |
---|---|
date | Sat, 16 Apr 2016 05:33:23 +0300 |
parents | 8c14f87bd0ae |
children | b74ca9ace65e |
rev | line source |
---|---|
22046
7a9cbb315d84
tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents:
20522
diff
changeset
|
1 #require killdaemons |
15446
c5c9ca3719f9
tests: use 'hghave serve' to guard tests that requires serve daemon management
Mads Kiilerich <mads@kiilerich.com>
parents:
14831
diff
changeset
|
2 |
14199
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
3 Tests discovery against servers without getbundle support: |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
4 |
25116
249c7e922d1a
test-discovery: disable bundle2 for legacy test (issue4610)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23975
diff
changeset
|
5 $ CAP="getbundle bundle2" |
14199
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
6 $ . "$TESTDIR/notcapable" |
14200
dc733eec9169
test-treediscovery: fix escaping for both dash and bash
Martin Geisler <mg@lazybytes.net>
parents:
14199
diff
changeset
|
7 $ cat >> $HGRCPATH <<EOF |
dc733eec9169
test-treediscovery: fix escaping for both dash and bash
Martin Geisler <mg@lazybytes.net>
parents:
14199
diff
changeset
|
8 > [ui] |
dc733eec9169
test-treediscovery: fix escaping for both dash and bash
Martin Geisler <mg@lazybytes.net>
parents:
14199
diff
changeset
|
9 > logtemplate="{rev} {node|short}: {desc} {branches}\n" |
dc733eec9169
test-treediscovery: fix escaping for both dash and bash
Martin Geisler <mg@lazybytes.net>
parents:
14199
diff
changeset
|
10 > EOF |
14199
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
11 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
12 Setup HTTP server control: |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
13 |
14203
b230922eb0c3
check-code: fix checking for sh style in .t tests
Mads Kiilerich <mads@kiilerich.com>
parents:
14200
diff
changeset
|
14 $ remote=http://localhost:$HGPORT/ |
b230922eb0c3
check-code: fix checking for sh style in .t tests
Mads Kiilerich <mads@kiilerich.com>
parents:
14200
diff
changeset
|
15 $ export remote |
14831
0407b7613e99
treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents:
14698
diff
changeset
|
16 $ tstart() { |
14199
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
17 > echo '[web]' > $1/.hg/hgrc |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
18 > echo 'push_ssl = false' >> $1/.hg/hgrc |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
19 > echo 'allow_push = *' >> $1/.hg/hgrc |
22181
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
20 > hg serve -R $1 -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
14199
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
21 > cat hg.pid >> $DAEMON_PIDS |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
22 > } |
14831
0407b7613e99
treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents:
14698
diff
changeset
|
23 $ tstop() { |
25474
8c14f87bd0ae
tests: drop DAEMON_PIDS from killdaemons calls
Matt Mackall <mpm@selenic.com>
parents:
25472
diff
changeset
|
24 > killdaemons.py |
22181
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
25 > [ "$1" ] && cut -d' ' -f6- access.log && cat errors.log |
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
26 > rm access.log errors.log |
14199
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
27 > } |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
28 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
29 Both are empty: |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
30 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
31 $ hg init empty1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
32 $ hg init empty2 |
14831
0407b7613e99
treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents:
14698
diff
changeset
|
33 $ tstart empty2 |
14199
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
34 $ hg incoming -R empty1 $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
35 comparing with http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
36 no changes found |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
37 [1] |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
38 $ hg outgoing -R empty1 $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
39 comparing with http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
40 no changes found |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
41 [1] |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
42 $ hg pull -R empty1 $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
43 pulling from http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
44 no changes found |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
45 $ hg push -R empty1 $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
46 pushing to http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
47 no changes found |
16023
90f8b8dd0326
push: return 1 if no changes found (issue3228)
Matt Mackall <mpm@selenic.com>
parents:
15446
diff
changeset
|
48 [1] |
14831
0407b7613e99
treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents:
14698
diff
changeset
|
49 $ tstop |
14199
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
50 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
51 Base repo: |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
52 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
53 $ hg init main |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
54 $ cd main |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
55 $ hg debugbuilddag -mo '+2:tbase @name1 +3:thead1 <tbase @name2 +4:thead2 @both /thead1 +2:tmaintip' |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
17539
diff
changeset
|
56 $ hg log -G |
14199
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
57 o 11 a19bfa7e7328: r11 both |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
58 | |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
59 o 10 8b6bad1512e1: r10 both |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
60 | |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
61 o 9 025829e08038: r9 both |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
62 |\ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
63 | o 8 d8f638ac69e9: r8 name2 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
64 | | |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
65 | o 7 b6b4d315a2ac: r7 name2 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
66 | | |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
67 | o 6 6c6f5d5f3c11: r6 name2 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
68 | | |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
69 | o 5 70314b29987d: r5 name2 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
70 | | |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
71 o | 4 e71dbbc70e03: r4 name1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
72 | | |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
73 o | 3 2c8d5d5ec612: r3 name1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
74 | | |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
75 o | 2 a7892891da29: r2 name1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
76 |/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
77 o 1 0019a3b924fd: r1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
78 | |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
79 o 0 d57206cc072a: r0 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
80 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
81 $ cd .. |
14831
0407b7613e99
treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents:
14698
diff
changeset
|
82 $ tstart main |
14199
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
83 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
84 Full clone: |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
85 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
86 $ hg clone main full |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
87 updating to branch default |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
88 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
89 $ cd full |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
90 $ hg incoming $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
91 comparing with http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
92 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
93 no changes found |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
94 [1] |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
95 $ hg outgoing $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
96 comparing with http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
97 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
98 no changes found |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
99 [1] |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
100 $ hg pull $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
101 pulling from http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
102 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
103 no changes found |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
104 $ hg push $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
105 pushing to http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
106 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
107 no changes found |
16023
90f8b8dd0326
push: return 1 if no changes found (issue3228)
Matt Mackall <mpm@selenic.com>
parents:
15446
diff
changeset
|
108 [1] |
14199
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
109 $ cd .. |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
110 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
111 Local is empty: |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
112 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
113 $ cd empty1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
114 $ hg incoming $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
115 comparing with http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
116 0 d57206cc072a: r0 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
117 1 0019a3b924fd: r1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
118 2 a7892891da29: r2 name1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
119 3 2c8d5d5ec612: r3 name1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
120 4 e71dbbc70e03: r4 name1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
121 5 70314b29987d: r5 name2 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
122 6 6c6f5d5f3c11: r6 name2 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
123 7 b6b4d315a2ac: r7 name2 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
124 8 d8f638ac69e9: r8 name2 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
125 9 025829e08038: r9 both |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
126 10 8b6bad1512e1: r10 both |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
127 11 a19bfa7e7328: r11 both |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
128 $ hg outgoing $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
129 comparing with http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
130 no changes found |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
131 [1] |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
132 $ hg push $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
133 pushing to http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
134 no changes found |
16023
90f8b8dd0326
push: return 1 if no changes found (issue3228)
Matt Mackall <mpm@selenic.com>
parents:
15446
diff
changeset
|
135 [1] |
14199
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
136 $ hg pull $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
137 pulling from http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
138 requesting all changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
139 adding changesets |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
140 adding manifests |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
141 adding file changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
142 added 12 changesets with 24 changes to 2 files |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
143 (run 'hg update' to get a working copy) |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
144 $ hg incoming $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
145 comparing with http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
146 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
147 no changes found |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
148 [1] |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
149 $ cd .. |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
150 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
151 Local is subset: |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
152 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
153 $ hg clone main subset --rev name2 ; cd subset |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
154 adding changesets |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
155 adding manifests |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
156 adding file changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
157 added 6 changesets with 12 changes to 2 files |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
158 updating to branch name2 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
159 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
160 $ hg incoming $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
161 comparing with http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
162 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
163 6 a7892891da29: r2 name1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
164 7 2c8d5d5ec612: r3 name1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
165 8 e71dbbc70e03: r4 name1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
166 9 025829e08038: r9 both |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
167 10 8b6bad1512e1: r10 both |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
168 11 a19bfa7e7328: r11 both |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
169 $ hg outgoing $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
170 comparing with http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
171 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
172 no changes found |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
173 [1] |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
174 $ hg push $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
175 pushing to http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
176 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
177 no changes found |
16023
90f8b8dd0326
push: return 1 if no changes found (issue3228)
Matt Mackall <mpm@selenic.com>
parents:
15446
diff
changeset
|
178 [1] |
14199
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
179 $ hg pull $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
180 pulling from http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
181 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
182 adding changesets |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
183 adding manifests |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
184 adding file changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
185 added 6 changesets with 12 changes to 2 files |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
186 (run 'hg update' to get a working copy) |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
187 $ hg incoming $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
188 comparing with http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
189 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
190 no changes found |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
191 [1] |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
192 $ cd .. |
22181
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
193 $ tstop |
14199
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
194 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
195 Remote is empty: |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
196 |
22181
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
197 $ tstart empty2 |
14199
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
198 $ cd main |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
199 $ hg incoming $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
200 comparing with http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
201 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
202 no changes found |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
203 [1] |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
204 $ hg outgoing $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
205 comparing with http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
206 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
207 0 d57206cc072a: r0 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
208 1 0019a3b924fd: r1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
209 2 a7892891da29: r2 name1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
210 3 2c8d5d5ec612: r3 name1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
211 4 e71dbbc70e03: r4 name1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
212 5 70314b29987d: r5 name2 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
213 6 6c6f5d5f3c11: r6 name2 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
214 7 b6b4d315a2ac: r7 name2 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
215 8 d8f638ac69e9: r8 name2 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
216 9 025829e08038: r9 both |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
217 10 8b6bad1512e1: r10 both |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
218 11 a19bfa7e7328: r11 both |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
219 $ hg pull $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
220 pulling from http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
221 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
222 no changes found |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
223 $ hg push $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
224 pushing to http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
225 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
226 remote: adding changesets |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
227 remote: adding manifests |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
228 remote: adding file changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
229 remote: added 12 changesets with 24 changes to 2 files |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
230 $ hg outgoing $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
231 comparing with http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
232 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
233 no changes found |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
234 [1] |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
235 $ cd .. |
22181
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
236 $ tstop |
14199
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
237 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
238 Local is superset: |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
239 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
240 $ hg clone main subset2 --rev name2 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
241 adding changesets |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
242 adding manifests |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
243 adding file changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
244 added 6 changesets with 12 changes to 2 files |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
245 updating to branch name2 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
246 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
14831
0407b7613e99
treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents:
14698
diff
changeset
|
247 $ tstart subset2 |
14199
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
248 $ cd main |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
249 $ hg incoming $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
250 comparing with http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
251 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
252 no changes found |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
253 [1] |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
254 $ hg outgoing $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
255 comparing with http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
256 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
257 2 a7892891da29: r2 name1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
258 3 2c8d5d5ec612: r3 name1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
259 4 e71dbbc70e03: r4 name1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
260 9 025829e08038: r9 both |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
261 10 8b6bad1512e1: r10 both |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
262 11 a19bfa7e7328: r11 both |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
263 $ hg pull $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
264 pulling from http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
265 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
266 no changes found |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
267 $ hg push $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
268 pushing to http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
269 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
270 abort: push creates new remote branches: both, name1! |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
271 (use 'hg push --new-branch' to create new remote branches) |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
272 [255] |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
273 $ hg push $remote --new-branch |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
274 pushing to http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
275 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
276 remote: adding changesets |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
277 remote: adding manifests |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
278 remote: adding file changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
279 remote: added 6 changesets with 12 changes to 2 files |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
280 $ hg outgoing $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
281 comparing with http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
282 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
283 no changes found |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
284 [1] |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
285 $ cd .. |
22181
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
286 $ tstop |
14199
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
287 |
14410
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
288 Partial pull: |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
289 |
22181
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
290 $ tstart main |
14410
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
291 $ hg clone $remote partial --rev name2 |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
292 adding changesets |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
293 adding manifests |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
294 adding file changes |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
295 added 6 changesets with 12 changes to 2 files |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
296 updating to branch name2 |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
297 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
298 $ cd partial |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
299 $ hg incoming $remote |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
300 comparing with http://localhost:$HGPORT/ |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
301 searching for changes |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
302 6 a7892891da29: r2 name1 |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
303 7 2c8d5d5ec612: r3 name1 |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
304 8 e71dbbc70e03: r4 name1 |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
305 9 025829e08038: r9 both |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
306 10 8b6bad1512e1: r10 both |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
307 11 a19bfa7e7328: r11 both |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
308 $ hg incoming $remote --rev name1 |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
309 comparing with http://localhost:$HGPORT/ |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
310 searching for changes |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
311 6 a7892891da29: r2 name1 |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
312 7 2c8d5d5ec612: r3 name1 |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
313 8 e71dbbc70e03: r4 name1 |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
314 $ hg pull $remote --rev name1 |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
315 pulling from http://localhost:$HGPORT/ |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
316 searching for changes |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
317 adding changesets |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
318 adding manifests |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
319 adding file changes |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
320 added 3 changesets with 6 changes to 2 files (+1 heads) |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
321 (run 'hg heads' to see heads) |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
322 $ hg incoming $remote |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
323 comparing with http://localhost:$HGPORT/ |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
324 searching for changes |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
325 9 025829e08038: r9 both |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
326 10 8b6bad1512e1: r10 both |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
327 11 a19bfa7e7328: r11 both |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
328 $ cd .. |
22181
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
329 $ tstop |
14410
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
330 |
14698
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
331 Both have new stuff in new named branches: |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
332 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
333 $ hg clone main repo1a --rev name1 -q |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
334 $ hg clone repo1a repo1b -q |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
335 $ hg clone main repo2a --rev name2 -q |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
336 $ hg clone repo2a repo2b -q |
14831
0407b7613e99
treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents:
14698
diff
changeset
|
337 $ tstart repo1a |
14698
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
338 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
339 $ cd repo2a |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
340 $ hg incoming $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
341 comparing with http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
342 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
343 6 a7892891da29: r2 name1 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
344 7 2c8d5d5ec612: r3 name1 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
345 8 e71dbbc70e03: r4 name1 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
346 $ hg outgoing $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
347 comparing with http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
348 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
349 2 70314b29987d: r5 name2 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
350 3 6c6f5d5f3c11: r6 name2 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
351 4 b6b4d315a2ac: r7 name2 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
352 5 d8f638ac69e9: r8 name2 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
353 $ hg push $remote --new-branch |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
354 pushing to http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
355 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
356 remote: adding changesets |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
357 remote: adding manifests |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
358 remote: adding file changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
359 remote: added 4 changesets with 8 changes to 2 files (+1 heads) |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
360 $ hg pull $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
361 pulling from http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
362 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
363 adding changesets |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
364 adding manifests |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
365 adding file changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
366 added 3 changesets with 6 changes to 2 files (+1 heads) |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
367 (run 'hg heads' to see heads) |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
368 $ hg incoming $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
369 comparing with http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
370 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
371 no changes found |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
372 [1] |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
373 $ hg outgoing $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
374 comparing with http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
375 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
376 no changes found |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
377 [1] |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
378 $ cd .. |
22181
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
379 $ tstop |
14698
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
380 |
22181
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
381 $ tstart repo1b |
14698
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
382 $ cd repo2b |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
383 $ hg incoming $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
384 comparing with http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
385 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
386 6 a7892891da29: r2 name1 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
387 7 2c8d5d5ec612: r3 name1 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
388 8 e71dbbc70e03: r4 name1 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
389 $ hg outgoing $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
390 comparing with http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
391 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
392 2 70314b29987d: r5 name2 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
393 3 6c6f5d5f3c11: r6 name2 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
394 4 b6b4d315a2ac: r7 name2 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
395 5 d8f638ac69e9: r8 name2 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
396 $ hg pull $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
397 pulling from http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
398 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
399 adding changesets |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
400 adding manifests |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
401 adding file changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
402 added 3 changesets with 6 changes to 2 files (+1 heads) |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
403 (run 'hg heads' to see heads) |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
404 $ hg push $remote --new-branch |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
405 pushing to http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
406 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
407 remote: adding changesets |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
408 remote: adding manifests |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
409 remote: adding file changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
410 remote: added 4 changesets with 8 changes to 2 files (+1 heads) |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
411 $ hg incoming $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
412 comparing with http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
413 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
414 no changes found |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
415 [1] |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
416 $ hg outgoing $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
417 comparing with http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
418 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
419 no changes found |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
420 [1] |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
421 $ cd .. |
22181
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
422 $ tstop |
14698
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
423 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
424 Both have new stuff in existing named branches: |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
425 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
426 $ rm -r repo1a repo1b repo2a repo2b |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
427 $ hg clone main repo1a --rev 3 --rev 8 -q |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
428 $ hg clone repo1a repo1b -q |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
429 $ hg clone main repo2a --rev 4 --rev 7 -q |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
430 $ hg clone repo2a repo2b -q |
14831
0407b7613e99
treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents:
14698
diff
changeset
|
431 $ tstart repo1a |
14698
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
432 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
433 $ cd repo2a |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
434 $ hg incoming $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
435 comparing with http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
436 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
437 8 d8f638ac69e9: r8 name2 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
438 $ hg outgoing $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
439 comparing with http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
440 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
441 4 e71dbbc70e03: r4 name1 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
442 $ hg push $remote --new-branch |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
443 pushing to http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
444 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
445 remote: adding changesets |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
446 remote: adding manifests |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
447 remote: adding file changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
448 remote: added 1 changesets with 2 changes to 2 files |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
449 $ hg pull $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
450 pulling from http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
451 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
452 adding changesets |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
453 adding manifests |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
454 adding file changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
455 added 1 changesets with 2 changes to 2 files |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
456 (run 'hg update' to get a working copy) |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
457 $ hg incoming $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
458 comparing with http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
459 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
460 no changes found |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
461 [1] |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
462 $ hg outgoing $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
463 comparing with http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
464 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
465 no changes found |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
466 [1] |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
467 $ cd .. |
22181
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
468 $ tstop |
14698
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
469 |
22181
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
470 $ tstart repo1b |
14698
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
471 $ cd repo2b |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
472 $ hg incoming $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
473 comparing with http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
474 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
475 8 d8f638ac69e9: r8 name2 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
476 $ hg outgoing $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
477 comparing with http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
478 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
479 4 e71dbbc70e03: r4 name1 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
480 $ hg pull $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
481 pulling from http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
482 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
483 adding changesets |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
484 adding manifests |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
485 adding file changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
486 added 1 changesets with 2 changes to 2 files |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
487 (run 'hg update' to get a working copy) |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
488 $ hg push $remote --new-branch |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
489 pushing to http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
490 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
491 remote: adding changesets |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
492 remote: adding manifests |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
493 remote: adding file changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
494 remote: added 1 changesets with 2 changes to 2 files |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
495 $ hg incoming $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
496 comparing with http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
497 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
498 no changes found |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
499 [1] |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
500 $ hg outgoing $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
501 comparing with http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
502 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
503 no changes found |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
504 [1] |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
505 $ cd .. |
22181
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
506 $ tstop show |
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
507 "GET /?cmd=capabilities HTTP/1.1" 200 - |
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
508 "GET /?cmd=heads HTTP/1.1" 200 - |
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
509 "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 |
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
510 "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 |
22182
510cafe72004
incoming: don't request heads that already are common
Mads Kiilerich <madski@unity3d.com>
parents:
22181
diff
changeset
|
511 "GET /?cmd=changegroupsubset HTTP/1.1" 200 - x-hgarg-1:bases=d8f638ac69e9ae8dea4f09f11d696546a912d961&heads=d8f638ac69e9ae8dea4f09f11d696546a912d961 |
23633
96c3cbec006f
incoming: handle phases the same as pull
Eric Sumner <ericsumner@fb.com>
parents:
22645
diff
changeset
|
512 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases |
22181
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
513 "GET /?cmd=capabilities HTTP/1.1" 200 - |
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
514 "GET /?cmd=heads HTTP/1.1" 200 - |
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
515 "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 |
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
516 "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 |
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
517 "GET /?cmd=capabilities HTTP/1.1" 200 - |
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
518 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks |
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
519 "GET /?cmd=heads HTTP/1.1" 200 - |
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
520 "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 |
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
521 "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 |
23975
3b7088a5c64c
discovery: properly exclude locally known but filtered heads
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23633
diff
changeset
|
522 "GET /?cmd=changegroupsubset HTTP/1.1" 200 - x-hgarg-1:bases=d8f638ac69e9ae8dea4f09f11d696546a912d961&heads=d8f638ac69e9ae8dea4f09f11d696546a912d961 |
22181
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
523 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases |
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
524 "GET /?cmd=capabilities HTTP/1.1" 200 - |
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
525 "GET /?cmd=heads HTTP/1.1" 200 - |
22214
3f93eff1de57
test-treediscovery: update output after merge
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22207
diff
changeset
|
526 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases |
22239
0688010ee38f
push: move bookmark discovery with other discovery steps
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22214
diff
changeset
|
527 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks |
22181
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
528 "GET /?cmd=branchmap HTTP/1.1" 200 - |
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
529 "GET /?cmd=branchmap HTTP/1.1" 200 - |
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
530 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks |
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
531 "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=686173686564+1827a5bb63e602382eb89dd58f2ac9f3b007ad91 |
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
532 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases |
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
533 "GET /?cmd=capabilities HTTP/1.1" 200 - |
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
534 "GET /?cmd=heads HTTP/1.1" 200 - |
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
535 "GET /?cmd=capabilities HTTP/1.1" 200 - |
851db07bb2de
tests: improve test coverage for discovery and actual parameters for pulling
Mads Kiilerich <madski@unity3d.com>
parents:
20522
diff
changeset
|
536 "GET /?cmd=heads HTTP/1.1" 200 - |