Mercurial > hg
annotate tests/test-treediscovery.t @ 14732:e9ed3506f066 stable
backout of d04ba50e104d: allow to qpop/push with a dirty working copy
The new behavior was breaking existing tools that relied on a sequence such as
this:
1) start with a dirty working copy
2) qimport some patch
3) try to qpush it
4) old behavior would fail at this point due to outstanding changes.
(new behavior would only fail if the outstanding changes and the patches
changes intersect)
5) innocent user qrefreshes, gets his local changes in the imported patch
It's worth considering if we can move this behavior to -f in the future.
author | Idan Kamara <idankk86@gmail.com> |
---|---|
date | Fri, 24 Jun 2011 23:25:42 +0300 |
parents | df902fe3d79e |
children | 0407b7613e99 |
rev | line source |
---|---|
14199
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
1 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
|
2 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
3 $ CAP=getbundle |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
4 $ . "$TESTDIR/notcapable" |
14200
dc733eec9169
test-treediscovery: fix escaping for both dash and bash
Martin Geisler <mg@lazybytes.net>
parents:
14199
diff
changeset
|
5 $ cat >> $HGRCPATH <<EOF |
dc733eec9169
test-treediscovery: fix escaping for both dash and bash
Martin Geisler <mg@lazybytes.net>
parents:
14199
diff
changeset
|
6 > [ui] |
dc733eec9169
test-treediscovery: fix escaping for both dash and bash
Martin Geisler <mg@lazybytes.net>
parents:
14199
diff
changeset
|
7 > 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
|
8 > [extensions] |
dc733eec9169
test-treediscovery: fix escaping for both dash and bash
Martin Geisler <mg@lazybytes.net>
parents:
14199
diff
changeset
|
9 > graphlog= |
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 |
14199
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
16 $ start() { |
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 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
20 > hg serve -R $1 -p $HGPORT -d --pid-file=hg.pid -E errors.log |
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 > } |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
23 $ stop() { |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
24 > "$TESTDIR/killdaemons.py" |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
25 > } |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
26 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
27 Both are empty: |
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 $ hg init empty1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
30 $ hg init empty2 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
31 $ start empty2 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
32 $ hg incoming -R empty1 $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
33 comparing with http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
34 no changes found |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
35 [1] |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
36 $ hg outgoing -R empty1 $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
37 comparing with http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
38 no changes found |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
39 [1] |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
40 $ hg pull -R empty1 $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
41 pulling from http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
42 no changes found |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
43 $ hg push -R empty1 $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
44 pushing to http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
45 no changes found |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
46 $ stop |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
47 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
48 Base repo: |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
49 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
50 $ hg init main |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
51 $ cd main |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
52 $ hg debugbuilddag -mo '+2:tbase @name1 +3:thead1 <tbase @name2 +4:thead2 @both /thead1 +2:tmaintip' |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
53 $ hg glog |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
54 o 11 a19bfa7e7328: r11 both |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
55 | |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
56 o 10 8b6bad1512e1: r10 both |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
57 | |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
58 o 9 025829e08038: r9 both |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
59 |\ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
60 | o 8 d8f638ac69e9: r8 name2 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
61 | | |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
62 | o 7 b6b4d315a2ac: r7 name2 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
63 | | |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
64 | o 6 6c6f5d5f3c11: r6 name2 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
65 | | |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
66 | o 5 70314b29987d: r5 name2 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
67 | | |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
68 o | 4 e71dbbc70e03: r4 name1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
69 | | |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
70 o | 3 2c8d5d5ec612: r3 name1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
71 | | |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
72 o | 2 a7892891da29: r2 name1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
73 |/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
74 o 1 0019a3b924fd: r1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
75 | |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
76 o 0 d57206cc072a: r0 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
77 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
78 $ cd .. |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
79 $ start main |
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 Full clone: |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
82 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
83 $ hg clone main full |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
84 updating to branch default |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
85 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
|
86 $ cd full |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
87 $ hg incoming $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
88 comparing with http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
89 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
90 no changes found |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
91 [1] |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
92 $ hg outgoing $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
93 comparing with http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
94 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
95 no changes found |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
96 [1] |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
97 $ hg pull $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
98 pulling from http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
99 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
100 no changes found |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
101 $ hg push $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
102 pushing to http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
103 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
104 no changes found |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
105 $ cd .. |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
106 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
107 Local is empty: |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
108 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
109 $ cd empty1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
110 $ hg incoming $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
111 comparing with http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
112 0 d57206cc072a: r0 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
113 1 0019a3b924fd: r1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
114 2 a7892891da29: r2 name1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
115 3 2c8d5d5ec612: r3 name1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
116 4 e71dbbc70e03: r4 name1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
117 5 70314b29987d: r5 name2 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
118 6 6c6f5d5f3c11: r6 name2 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
119 7 b6b4d315a2ac: r7 name2 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
120 8 d8f638ac69e9: r8 name2 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
121 9 025829e08038: r9 both |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
122 10 8b6bad1512e1: r10 both |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
123 11 a19bfa7e7328: r11 both |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
124 $ hg outgoing $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
125 comparing with http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
126 no changes found |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
127 [1] |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
128 $ hg push $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
129 pushing to 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 $ hg pull $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
132 pulling from http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
133 requesting all changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
134 adding changesets |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
135 adding manifests |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
136 adding file changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
137 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
|
138 (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
|
139 $ hg incoming $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
140 comparing with http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
141 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
142 no changes found |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
143 [1] |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
144 $ cd .. |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
145 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
146 Local is subset: |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
147 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
148 $ 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
|
149 adding changesets |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
150 adding manifests |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
151 adding file changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
152 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
|
153 updating to branch name2 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
154 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
|
155 $ hg incoming $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
156 comparing with http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
157 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
158 6 a7892891da29: r2 name1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
159 7 2c8d5d5ec612: r3 name1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
160 8 e71dbbc70e03: r4 name1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
161 9 025829e08038: r9 both |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
162 10 8b6bad1512e1: r10 both |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
163 11 a19bfa7e7328: r11 both |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
164 $ hg outgoing $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
165 comparing with http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
166 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
167 no changes found |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
168 [1] |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
169 $ hg push $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
170 pushing to 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 $ hg pull $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
174 pulling from http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
175 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
176 adding changesets |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
177 adding manifests |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
178 adding file changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
179 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
|
180 (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
|
181 $ hg incoming $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
182 comparing with http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
183 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
184 no changes found |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
185 [1] |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
186 $ cd .. |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
187 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
188 Remote is empty: |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
189 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
190 $ stop ; start empty2 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
191 $ cd main |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
192 $ hg incoming $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
193 comparing with http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
194 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
195 no changes found |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
196 [1] |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
197 $ hg outgoing $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
198 comparing with http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
199 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
200 0 d57206cc072a: r0 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
201 1 0019a3b924fd: r1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
202 2 a7892891da29: r2 name1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
203 3 2c8d5d5ec612: r3 name1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
204 4 e71dbbc70e03: r4 name1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
205 5 70314b29987d: r5 name2 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
206 6 6c6f5d5f3c11: r6 name2 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
207 7 b6b4d315a2ac: r7 name2 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
208 8 d8f638ac69e9: r8 name2 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
209 9 025829e08038: r9 both |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
210 10 8b6bad1512e1: r10 both |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
211 11 a19bfa7e7328: r11 both |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
212 $ hg pull $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
213 pulling from http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
214 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
215 no changes found |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
216 $ hg push $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
217 pushing to http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
218 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
219 remote: adding changesets |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
220 remote: adding manifests |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
221 remote: adding file changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
222 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
|
223 $ hg outgoing $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
224 comparing with 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 no changes found |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
227 [1] |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
228 $ cd .. |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
229 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
230 Local is superset: |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
231 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
232 $ stop |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
233 $ 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
|
234 adding changesets |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
235 adding manifests |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
236 adding file changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
237 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
|
238 updating to branch name2 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
239 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
|
240 $ start subset2 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
241 $ cd main |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
242 $ hg incoming $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
243 comparing with http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
244 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
245 no changes found |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
246 [1] |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
247 $ hg outgoing $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
248 comparing with http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
249 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
250 2 a7892891da29: r2 name1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
251 3 2c8d5d5ec612: r3 name1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
252 4 e71dbbc70e03: r4 name1 |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
253 9 025829e08038: r9 both |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
254 10 8b6bad1512e1: r10 both |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
255 11 a19bfa7e7328: r11 both |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
256 $ hg pull $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
257 pulling from http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
258 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
259 no changes found |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
260 $ hg push $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
261 pushing to http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
262 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
263 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
|
264 (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
|
265 [255] |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
266 $ hg push $remote --new-branch |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
267 pushing to http://localhost:$HGPORT/ |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
268 searching for changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
269 remote: adding changesets |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
270 remote: adding manifests |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
271 remote: adding file changes |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
272 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
|
273 $ hg outgoing $remote |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
274 comparing with 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 no changes found |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
277 [1] |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
278 $ cd .. |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
279 |
14410
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
280 Partial pull: |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
281 |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
282 $ stop ; start main |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
283 $ 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
|
284 adding changesets |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
285 adding manifests |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
286 adding file changes |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
287 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
|
288 updating to branch name2 |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
289 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
|
290 $ cd partial |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
291 $ hg incoming $remote |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
292 comparing with http://localhost:$HGPORT/ |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
293 searching for changes |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
294 6 a7892891da29: r2 name1 |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
295 7 2c8d5d5ec612: r3 name1 |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
296 8 e71dbbc70e03: r4 name1 |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
297 9 025829e08038: r9 both |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
298 10 8b6bad1512e1: r10 both |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
299 11 a19bfa7e7328: r11 both |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
300 $ hg incoming $remote --rev name1 |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
301 comparing with http://localhost:$HGPORT/ |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
302 searching for changes |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
303 6 a7892891da29: r2 name1 |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
304 7 2c8d5d5ec612: r3 name1 |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
305 8 e71dbbc70e03: r4 name1 |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
306 $ hg pull $remote --rev name1 |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
307 pulling from http://localhost:$HGPORT/ |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
308 searching for changes |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
309 adding changesets |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
310 adding manifests |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
311 adding file changes |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
312 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
|
313 (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
|
314 $ hg incoming $remote |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
315 comparing with 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 9 025829e08038: r9 both |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
318 10 8b6bad1512e1: r10 both |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
319 11 a19bfa7e7328: r11 both |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
320 $ cd .. |
afeb14a8128a
tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14203
diff
changeset
|
321 |
14698
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
322 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
|
323 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
324 $ stop |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
325 $ hg clone main repo1a --rev name1 -q |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
326 $ hg clone repo1a repo1b -q |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
327 $ hg clone main repo2a --rev name2 -q |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
328 $ hg clone repo2a repo2b -q |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
329 $ start repo1a |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
330 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
331 $ cd repo2a |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
332 $ hg incoming $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
333 comparing with http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
334 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
335 6 a7892891da29: r2 name1 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
336 7 2c8d5d5ec612: r3 name1 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
337 8 e71dbbc70e03: r4 name1 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
338 $ hg outgoing $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
339 comparing with http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
340 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
341 2 70314b29987d: r5 name2 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
342 3 6c6f5d5f3c11: r6 name2 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
343 4 b6b4d315a2ac: r7 name2 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
344 5 d8f638ac69e9: r8 name2 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
345 $ hg push $remote --new-branch |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
346 pushing to http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
347 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
348 remote: adding changesets |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
349 remote: adding manifests |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
350 remote: adding file changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
351 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
|
352 $ hg pull $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
353 pulling from http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
354 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
355 adding changesets |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
356 adding manifests |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
357 adding file changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
358 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
|
359 (run 'hg heads' to see heads) |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
360 $ hg incoming $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
361 comparing with 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 no changes found |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
364 [1] |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
365 $ hg outgoing $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
366 comparing with http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
367 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
368 no changes found |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
369 [1] |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
370 $ cd .. |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
371 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
372 $ stop ; start repo1b |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
373 $ cd repo2b |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
374 $ hg incoming $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
375 comparing with http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
376 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
377 6 a7892891da29: r2 name1 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
378 7 2c8d5d5ec612: r3 name1 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
379 8 e71dbbc70e03: r4 name1 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
380 $ hg outgoing $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
381 comparing with http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
382 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
383 2 70314b29987d: r5 name2 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
384 3 6c6f5d5f3c11: r6 name2 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
385 4 b6b4d315a2ac: r7 name2 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
386 5 d8f638ac69e9: r8 name2 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
387 $ hg pull $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
388 pulling from http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
389 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
390 adding changesets |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
391 adding manifests |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
392 adding file changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
393 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
|
394 (run 'hg heads' to see heads) |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
395 $ hg push $remote --new-branch |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
396 pushing to http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
397 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
398 remote: adding changesets |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
399 remote: adding manifests |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
400 remote: adding file changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
401 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
|
402 $ hg incoming $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
403 comparing with http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
404 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
405 no changes found |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
406 [1] |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
407 $ hg outgoing $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
408 comparing with http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
409 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
410 no changes found |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
411 [1] |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
412 $ cd .. |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
413 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
414 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
|
415 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
416 $ stop |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
417 $ rm -r repo1a repo1b repo2a repo2b |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
418 $ 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
|
419 $ hg clone repo1a repo1b -q |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
420 $ 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
|
421 $ hg clone repo2a repo2b -q |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
422 $ start repo1a |
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 $ cd repo2a |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
425 $ hg incoming $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
426 comparing with http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
427 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
428 8 d8f638ac69e9: r8 name2 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
429 $ hg outgoing $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
430 comparing with http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
431 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
432 4 e71dbbc70e03: r4 name1 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
433 $ hg push $remote --new-branch |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
434 pushing to http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
435 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
436 remote: adding changesets |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
437 remote: adding manifests |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
438 remote: adding file changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
439 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
|
440 $ hg pull $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
441 pulling from http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
442 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
443 adding changesets |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
444 adding manifests |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
445 adding file changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
446 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
|
447 (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
|
448 $ hg incoming $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
449 comparing with http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
450 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
451 no changes found |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
452 [1] |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
453 $ hg outgoing $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
454 comparing with http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
455 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
456 no changes found |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
457 [1] |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
458 $ cd .. |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
459 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
460 $ stop ; start repo1b |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
461 $ cd repo2b |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
462 $ hg incoming $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 8 d8f638ac69e9: r8 name2 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
466 $ hg outgoing $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
467 comparing with http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
468 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
469 4 e71dbbc70e03: r4 name1 |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
470 $ hg pull $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
471 pulling from http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
472 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
473 adding changesets |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
474 adding manifests |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
475 adding file changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
476 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
|
477 (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
|
478 $ hg push $remote --new-branch |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
479 pushing to http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
480 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
481 remote: adding changesets |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
482 remote: adding manifests |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
483 remote: adding file changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
484 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
|
485 $ hg incoming $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
486 comparing with http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
487 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
488 no changes found |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
489 [1] |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
490 $ hg outgoing $remote |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
491 comparing with http://localhost:$HGPORT/ |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
492 searching for changes |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
493 no changes found |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
494 [1] |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
495 $ cd .. |
df902fe3d79e
treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14410
diff
changeset
|
496 |
14199
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
497 $ stop |
e3dd3dcd6059
treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
498 |