author | Pierre-Yves David <pierre-yves.david@octobus.net> |
Wed, 27 Mar 2019 16:45:14 +0100 | |
changeset 42041 | 3e47d1ec9da5 |
parent 41896 | 94faa2e84094 |
child 42897 | d7304434390f |
permissions | -rw-r--r-- |
22961
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
1 |
Create an extension to test bundle2 with multiple changegroups |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
2 |
|
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
3 |
$ cat > bundle2.py <<EOF |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
4 |
> """ |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
5 |
> """ |
29807
d4e026341e16
getchangegroup: take an 'outgoing' object as argument (API)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
29672
diff
changeset
|
6 |
> from mercurial import changegroup, discovery, exchange |
22961
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
7 |
> |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
8 |
> def _getbundlechangegrouppart(bundler, repo, source, bundlecaps=None, |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
9 |
> b2caps=None, heads=None, common=None, |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
10 |
> **kwargs): |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
11 |
> # Create two changegroups given the common changesets and heads for the |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
12 |
> # changegroup part we are being requested. Use the parent of each head |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
13 |
> # in 'heads' as intermediate heads for the first changegroup. |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
14 |
> intermediates = [repo[r].p1().node() for r in heads] |
29807
d4e026341e16
getchangegroup: take an 'outgoing' object as argument (API)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
29672
diff
changeset
|
15 |
> outgoing = discovery.outgoing(repo, common, intermediates) |
35570
3e3f4c03876b
tests: add b'' to string literals where bytes are required
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35393
diff
changeset
|
16 |
> cg = changegroup.makechangegroup(repo, outgoing, b'01', |
34101
5ede882c249c
changegroup: replace getchangegroup with makechangegroup
Durham Goode <durham@fb.com>
parents:
32287
diff
changeset
|
17 |
> source, bundlecaps=bundlecaps) |
35570
3e3f4c03876b
tests: add b'' to string literals where bytes are required
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35393
diff
changeset
|
18 |
> bundler.newpart(b'output', data=b'changegroup1') |
3e3f4c03876b
tests: add b'' to string literals where bytes are required
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35393
diff
changeset
|
19 |
> bundler.newpart(b'changegroup', data=cg.getchunks()) |
29807
d4e026341e16
getchangegroup: take an 'outgoing' object as argument (API)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
29672
diff
changeset
|
20 |
> outgoing = discovery.outgoing(repo, common + intermediates, heads) |
35570
3e3f4c03876b
tests: add b'' to string literals where bytes are required
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35393
diff
changeset
|
21 |
> cg = changegroup.makechangegroup(repo, outgoing, b'01', |
34101
5ede882c249c
changegroup: replace getchangegroup with makechangegroup
Durham Goode <durham@fb.com>
parents:
32287
diff
changeset
|
22 |
> source, bundlecaps=bundlecaps) |
35570
3e3f4c03876b
tests: add b'' to string literals where bytes are required
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35393
diff
changeset
|
23 |
> bundler.newpart(b'output', data=b'changegroup2') |
3e3f4c03876b
tests: add b'' to string literals where bytes are required
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35393
diff
changeset
|
24 |
> bundler.newpart(b'changegroup', data=cg.getchunks()) |
22961
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
25 |
> |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
26 |
> def _pull(repo, *args, **kwargs): |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
27 |
> pullop = _orig_pull(repo, *args, **kwargs) |
35570
3e3f4c03876b
tests: add b'' to string literals where bytes are required
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35393
diff
changeset
|
28 |
> repo.ui.write(b'pullop.cgresult is %d\n' % pullop.cgresult) |
22961
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
29 |
> return pullop |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
30 |
> |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
31 |
> _orig_pull = exchange.pull |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
32 |
> exchange.pull = _pull |
35570
3e3f4c03876b
tests: add b'' to string literals where bytes are required
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35393
diff
changeset
|
33 |
> exchange.getbundle2partsmapping[b'changegroup'] = _getbundlechangegrouppart |
22961
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
34 |
> EOF |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
35 |
|
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
36 |
$ cat >> $HGRCPATH << EOF |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
37 |
> [ui] |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
38 |
> logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline} |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
39 |
> EOF |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
40 |
|
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
41 |
Start with a simple repository with a single commit |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
42 |
|
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
43 |
$ hg init repo |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
44 |
$ cd repo |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
45 |
$ cat > .hg/hgrc << EOF |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
46 |
> [extensions] |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
47 |
> bundle2=$TESTTMP/bundle2.py |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
48 |
> EOF |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
49 |
|
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
50 |
$ echo A > A |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
51 |
$ hg commit -A -m A -q |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
52 |
$ cd .. |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
53 |
|
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
54 |
Clone |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
55 |
|
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
56 |
$ hg clone -q repo clone |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
57 |
|
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
58 |
Add two linear commits |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
59 |
|
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
60 |
$ cd repo |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
61 |
$ echo B > B |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
62 |
$ hg commit -A -m B -q |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
63 |
$ echo C > C |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
64 |
$ hg commit -A -m C -q |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
65 |
|
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
66 |
$ cd ../clone |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
67 |
$ cat >> .hg/hgrc <<EOF |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
68 |
> [hooks] |
41638
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
69 |
> pretxnchangegroup = sh -c "printenv.py --line pretxnchangegroup" |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
70 |
> changegroup = sh -c "printenv.py --line changegroup" |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
71 |
> incoming = sh -c "printenv.py --line incoming" |
22961
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
72 |
> EOF |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
73 |
|
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
74 |
Pull the new commits in the clone |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
75 |
|
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
76 |
$ hg pull |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
77 |
pulling from $TESTTMP/repo |
22961
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
78 |
searching for changes |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
79 |
remote: changegroup1 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
80 |
adding changesets |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
81 |
adding manifests |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
82 |
adding file changes |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
83 |
added 1 changesets with 1 changes to 1 files |
41638
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
84 |
pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
85 |
HG_HOOKTYPE=pretxnchangegroup |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
86 |
HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
87 |
HG_NODE_LAST=27547f69f25460a52fff66ad004e58da7ad3fb56 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
88 |
HG_PENDING=$TESTTMP/clone |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
89 |
HG_SOURCE=pull |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
90 |
HG_TXNID=TXN:$ID$ |
41896
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
91 |
HG_TXNNAME=pull |
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
92 |
file:/*/$TESTTMP/repo (glob) |
41638
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
93 |
HG_URL=file:$TESTTMP/repo |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
94 |
|
22961
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
95 |
remote: changegroup2 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
96 |
adding changesets |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
97 |
adding manifests |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
98 |
adding file changes |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
99 |
added 1 changesets with 1 changes to 1 files |
41638
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
100 |
pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
101 |
HG_HOOKTYPE=pretxnchangegroup |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
102 |
HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
103 |
HG_NODE_LAST=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
104 |
HG_PENDING=$TESTTMP/clone |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
105 |
HG_PHASES_MOVED=1 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
106 |
HG_SOURCE=pull |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
107 |
HG_TXNID=TXN:$ID$ |
41896
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
108 |
HG_TXNNAME=pull |
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
109 |
file:/*/$TESTTMP/repo (glob) |
41638
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
110 |
HG_URL=file:$TESTTMP/repo |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
111 |
|
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34101
diff
changeset
|
112 |
new changesets 27547f69f254:f838bfaca5c7 |
41638
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
113 |
changegroup hook: HG_HOOKNAME=changegroup |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
114 |
HG_HOOKTYPE=changegroup |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
115 |
HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
116 |
HG_NODE_LAST=27547f69f25460a52fff66ad004e58da7ad3fb56 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
117 |
HG_SOURCE=pull |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
118 |
HG_TXNID=TXN:$ID$ |
41896
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
119 |
HG_TXNNAME=pull |
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
120 |
file:/*/$TESTTMP/repo (glob) |
41638
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
121 |
HG_URL=file:$TESTTMP/repo |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
122 |
|
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
123 |
incoming hook: HG_HOOKNAME=incoming |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
124 |
HG_HOOKTYPE=incoming |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
125 |
HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
126 |
HG_SOURCE=pull |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
127 |
HG_TXNID=TXN:$ID$ |
41896
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
128 |
HG_TXNNAME=pull |
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
129 |
file:/*/$TESTTMP/repo (glob) |
41638
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
130 |
HG_URL=file:$TESTTMP/repo |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
131 |
|
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
132 |
changegroup hook: HG_HOOKNAME=changegroup |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
133 |
HG_HOOKTYPE=changegroup |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
134 |
HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
135 |
HG_NODE_LAST=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
136 |
HG_PHASES_MOVED=1 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
137 |
HG_SOURCE=pull |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
138 |
HG_TXNID=TXN:$ID$ |
41896
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
139 |
HG_TXNNAME=pull |
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
140 |
file:/*/$TESTTMP/repo (glob) |
41638
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
141 |
HG_URL=file:$TESTTMP/repo |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
142 |
|
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
143 |
incoming hook: HG_HOOKNAME=incoming |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
144 |
HG_HOOKTYPE=incoming |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
145 |
HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
146 |
HG_PHASES_MOVED=1 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
147 |
HG_SOURCE=pull |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
148 |
HG_TXNID=TXN:$ID$ |
41896
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
149 |
HG_TXNNAME=pull |
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
150 |
file:/*/$TESTTMP/repo (glob) |
41638
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
151 |
HG_URL=file:$TESTTMP/repo |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
152 |
|
22961
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
153 |
pullop.cgresult is 1 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
154 |
(run 'hg update' to get a working copy) |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
155 |
$ hg update |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
156 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
157 |
$ hg log -G |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
158 |
@ 2:f838bfaca5c7 public test C |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
159 |
| |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
160 |
o 1:27547f69f254 public test B |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
161 |
| |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
162 |
o 0:4a2df7238c3b public test A |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
163 |
|
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
164 |
Add more changesets with multiple heads to the original repository |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
165 |
|
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
166 |
$ cd ../repo |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
167 |
$ echo D > D |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
168 |
$ hg commit -A -m D -q |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
169 |
$ hg up -r 1 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
170 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
171 |
$ echo E > E |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
172 |
$ hg commit -A -m E -q |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
173 |
$ echo F > F |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
174 |
$ hg commit -A -m F -q |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
175 |
$ hg up -r 1 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
176 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
177 |
$ echo G > G |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
178 |
$ hg commit -A -m G -q |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
179 |
$ hg up -r 3 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
180 |
2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
181 |
$ echo H > H |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
182 |
$ hg commit -A -m H -q |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
183 |
$ hg log -G |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
184 |
@ 7:5cd59d311f65 draft test H |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
185 |
| |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
186 |
| o 6:1d14c3ce6ac0 draft test G |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
187 |
| | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
188 |
| | o 5:7f219660301f draft test F |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
189 |
| | | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
190 |
| | o 4:8a5212ebc852 draft test E |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
191 |
| |/ |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
192 |
o | 3:b3325c91a4d9 draft test D |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
193 |
| | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
194 |
o | 2:f838bfaca5c7 draft test C |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
195 |
|/ |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
196 |
o 1:27547f69f254 draft test B |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
197 |
| |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
198 |
o 0:4a2df7238c3b draft test A |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
199 |
|
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
200 |
New heads are reported during transfer and properly accounted for in |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
201 |
pullop.cgresult |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
202 |
|
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
203 |
$ cd ../clone |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
204 |
$ hg pull |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
205 |
pulling from $TESTTMP/repo |
22961
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
206 |
searching for changes |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
207 |
remote: changegroup1 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
208 |
adding changesets |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
209 |
adding manifests |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
210 |
adding file changes |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
211 |
added 2 changesets with 2 changes to 2 files (+1 heads) |
41638
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
212 |
pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
213 |
HG_HOOKTYPE=pretxnchangegroup |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
214 |
HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
215 |
HG_NODE_LAST=8a5212ebc8527f9fb821601504794e3eb11a1ed3 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
216 |
HG_PENDING=$TESTTMP/clone |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
217 |
HG_SOURCE=pull |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
218 |
HG_TXNID=TXN:$ID$ |
41896
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
219 |
HG_TXNNAME=pull |
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
220 |
file:/*/$TESTTMP/repo (glob) |
41638
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
221 |
HG_URL=file:$TESTTMP/repo |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
222 |
|
22961
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
223 |
remote: changegroup2 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
224 |
adding changesets |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
225 |
adding manifests |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
226 |
adding file changes |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
227 |
added 3 changesets with 3 changes to 3 files (+1 heads) |
41638
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
228 |
pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
229 |
HG_HOOKTYPE=pretxnchangegroup |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
230 |
HG_NODE=7f219660301fe4c8a116f714df5e769695cc2b46 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
231 |
HG_NODE_LAST=5cd59d311f6508b8e0ed28a266756c859419c9f1 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
232 |
HG_PENDING=$TESTTMP/clone |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
233 |
HG_PHASES_MOVED=1 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
234 |
HG_SOURCE=pull |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
235 |
HG_TXNID=TXN:$ID$ |
41896
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
236 |
HG_TXNNAME=pull |
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
237 |
file:/*/$TESTTMP/repo (glob) |
41638
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
238 |
HG_URL=file:$TESTTMP/repo |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
239 |
|
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34101
diff
changeset
|
240 |
new changesets b3325c91a4d9:5cd59d311f65 |
41638
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
241 |
changegroup hook: HG_HOOKNAME=changegroup |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
242 |
HG_HOOKTYPE=changegroup |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
243 |
HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
244 |
HG_NODE_LAST=8a5212ebc8527f9fb821601504794e3eb11a1ed3 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
245 |
HG_SOURCE=pull |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
246 |
HG_TXNID=TXN:$ID$ |
41896
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
247 |
HG_TXNNAME=pull |
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
248 |
file:/*/$TESTTMP/repo (glob) |
41638
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
249 |
HG_URL=file:$TESTTMP/repo |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
250 |
|
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
251 |
incoming hook: HG_HOOKNAME=incoming |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
252 |
HG_HOOKTYPE=incoming |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
253 |
HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
254 |
HG_SOURCE=pull |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
255 |
HG_TXNID=TXN:$ID$ |
41896
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
256 |
HG_TXNNAME=pull |
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
257 |
file:/*/$TESTTMP/repo (glob) |
41638
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
258 |
HG_URL=file:$TESTTMP/repo |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
259 |
|
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
260 |
incoming hook: HG_HOOKNAME=incoming |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
261 |
HG_HOOKTYPE=incoming |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
262 |
HG_NODE=8a5212ebc8527f9fb821601504794e3eb11a1ed3 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
263 |
HG_SOURCE=pull |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
264 |
HG_TXNID=TXN:$ID$ |
41896
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
265 |
HG_TXNNAME=pull |
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
266 |
file:/*/$TESTTMP/repo (glob) |
41638
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
267 |
HG_URL=file:$TESTTMP/repo |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
268 |
|
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
269 |
changegroup hook: HG_HOOKNAME=changegroup |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
270 |
HG_HOOKTYPE=changegroup |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
271 |
HG_NODE=7f219660301fe4c8a116f714df5e769695cc2b46 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
272 |
HG_NODE_LAST=5cd59d311f6508b8e0ed28a266756c859419c9f1 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
273 |
HG_PHASES_MOVED=1 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
274 |
HG_SOURCE=pull |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
275 |
HG_TXNID=TXN:$ID$ |
41896
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
276 |
HG_TXNNAME=pull |
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
277 |
file:/*/$TESTTMP/repo (glob) |
41638
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
278 |
HG_URL=file:$TESTTMP/repo |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
279 |
|
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
280 |
incoming hook: HG_HOOKNAME=incoming |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
281 |
HG_HOOKTYPE=incoming |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
282 |
HG_NODE=7f219660301fe4c8a116f714df5e769695cc2b46 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
283 |
HG_PHASES_MOVED=1 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
284 |
HG_SOURCE=pull |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
285 |
HG_TXNID=TXN:$ID$ |
41896
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
286 |
HG_TXNNAME=pull |
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
287 |
file:/*/$TESTTMP/repo (glob) |
41638
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
288 |
HG_URL=file:$TESTTMP/repo |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
289 |
|
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
290 |
incoming hook: HG_HOOKNAME=incoming |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
291 |
HG_HOOKTYPE=incoming |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
292 |
HG_NODE=1d14c3ce6ac0582d2809220d33e8cd7a696e0156 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
293 |
HG_PHASES_MOVED=1 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
294 |
HG_SOURCE=pull |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
295 |
HG_TXNID=TXN:$ID$ |
41896
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
296 |
HG_TXNNAME=pull |
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
297 |
file:/*/$TESTTMP/repo (glob) |
41638
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
298 |
HG_URL=file:$TESTTMP/repo |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
299 |
|
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
300 |
incoming hook: HG_HOOKNAME=incoming |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
301 |
HG_HOOKTYPE=incoming |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
302 |
HG_NODE=5cd59d311f6508b8e0ed28a266756c859419c9f1 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
303 |
HG_PHASES_MOVED=1 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
304 |
HG_SOURCE=pull |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
305 |
HG_TXNID=TXN:$ID$ |
41896
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
306 |
HG_TXNNAME=pull |
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
307 |
file:/*/$TESTTMP/repo (glob) |
41638
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
308 |
HG_URL=file:$TESTTMP/repo |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
309 |
|
22961
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
310 |
pullop.cgresult is 3 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
311 |
(run 'hg heads' to see heads, 'hg merge' to merge) |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
312 |
$ hg log -G |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
313 |
o 7:5cd59d311f65 public test H |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
314 |
| |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
315 |
| o 6:1d14c3ce6ac0 public test G |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
316 |
| | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
317 |
| | o 5:7f219660301f public test F |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
318 |
| | | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
319 |
| | o 4:8a5212ebc852 public test E |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
320 |
| |/ |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
321 |
o | 3:b3325c91a4d9 public test D |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
322 |
| | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
323 |
@ | 2:f838bfaca5c7 public test C |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
324 |
|/ |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
325 |
o 1:27547f69f254 public test B |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
326 |
| |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
327 |
o 0:4a2df7238c3b public test A |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
328 |
|
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
329 |
Removing a head from the original repository by merging it |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
330 |
|
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
331 |
$ cd ../repo |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
332 |
$ hg merge -r 6 -q |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
333 |
$ hg commit -m Merge |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
334 |
$ echo I > I |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
335 |
$ hg commit -A -m H -q |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
336 |
$ hg log -G |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
337 |
@ 9:9d18e5bd9ab0 draft test H |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
338 |
| |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
339 |
o 8:71bd7b46de72 draft test Merge |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
340 |
|\ |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
341 |
| o 7:5cd59d311f65 draft test H |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
342 |
| | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
343 |
o | 6:1d14c3ce6ac0 draft test G |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
344 |
| | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
345 |
| | o 5:7f219660301f draft test F |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
346 |
| | | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
347 |
+---o 4:8a5212ebc852 draft test E |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
348 |
| | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
349 |
| o 3:b3325c91a4d9 draft test D |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
350 |
| | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
351 |
| o 2:f838bfaca5c7 draft test C |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
352 |
|/ |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
353 |
o 1:27547f69f254 draft test B |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
354 |
| |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
355 |
o 0:4a2df7238c3b draft test A |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
356 |
|
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
357 |
Removed heads are reported during transfer and properly accounted for in |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
358 |
pullop.cgresult |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
359 |
|
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
360 |
$ cd ../clone |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
361 |
$ hg pull |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
362 |
pulling from $TESTTMP/repo |
22961
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
363 |
searching for changes |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
364 |
remote: changegroup1 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
365 |
adding changesets |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
366 |
adding manifests |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
367 |
adding file changes |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
368 |
added 1 changesets with 0 changes to 0 files (-1 heads) |
41638
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
369 |
pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
370 |
HG_HOOKTYPE=pretxnchangegroup |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
371 |
HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
372 |
HG_NODE_LAST=71bd7b46de72e69a32455bf88d04757d542e6cf4 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
373 |
HG_PENDING=$TESTTMP/clone |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
374 |
HG_SOURCE=pull |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
375 |
HG_TXNID=TXN:$ID$ |
41896
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
376 |
HG_TXNNAME=pull |
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
377 |
file:/*/$TESTTMP/repo (glob) |
41638
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
378 |
HG_URL=file:$TESTTMP/repo |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
379 |
|
22961
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
380 |
remote: changegroup2 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
381 |
adding changesets |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
382 |
adding manifests |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
383 |
adding file changes |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
384 |
added 1 changesets with 1 changes to 1 files |
41638
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
385 |
pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
386 |
HG_HOOKTYPE=pretxnchangegroup |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
387 |
HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
388 |
HG_NODE_LAST=9d18e5bd9ab09337802595d49f1dad0c98df4d84 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
389 |
HG_PENDING=$TESTTMP/clone |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
390 |
HG_PHASES_MOVED=1 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
391 |
HG_SOURCE=pull |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
392 |
HG_TXNID=TXN:$ID$ |
41896
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
393 |
HG_TXNNAME=pull |
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
394 |
file:/*/$TESTTMP/repo (glob) |
41638
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
395 |
HG_URL=file:$TESTTMP/repo |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
396 |
|
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34101
diff
changeset
|
397 |
new changesets 71bd7b46de72:9d18e5bd9ab0 |
41638
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
398 |
changegroup hook: HG_HOOKNAME=changegroup |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
399 |
HG_HOOKTYPE=changegroup |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
400 |
HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
401 |
HG_NODE_LAST=71bd7b46de72e69a32455bf88d04757d542e6cf4 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
402 |
HG_SOURCE=pull |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
403 |
HG_TXNID=TXN:$ID$ |
41896
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
404 |
HG_TXNNAME=pull |
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
405 |
file:/*/$TESTTMP/repo (glob) |
41638
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
406 |
HG_URL=file:$TESTTMP/repo |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
407 |
|
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
408 |
incoming hook: HG_HOOKNAME=incoming |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
409 |
HG_HOOKTYPE=incoming |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
410 |
HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
411 |
HG_SOURCE=pull |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
412 |
HG_TXNID=TXN:$ID$ |
41896
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
413 |
HG_TXNNAME=pull |
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
414 |
file:/*/$TESTTMP/repo (glob) |
41638
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
415 |
HG_URL=file:$TESTTMP/repo |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
416 |
|
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
417 |
changegroup hook: HG_HOOKNAME=changegroup |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
418 |
HG_HOOKTYPE=changegroup |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
419 |
HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
420 |
HG_NODE_LAST=9d18e5bd9ab09337802595d49f1dad0c98df4d84 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
421 |
HG_PHASES_MOVED=1 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
422 |
HG_SOURCE=pull |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
423 |
HG_TXNID=TXN:$ID$ |
41896
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
424 |
HG_TXNNAME=pull |
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
425 |
file:/*/$TESTTMP/repo (glob) |
41638
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
426 |
HG_URL=file:$TESTTMP/repo |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
427 |
|
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
428 |
incoming hook: HG_HOOKNAME=incoming |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
429 |
HG_HOOKTYPE=incoming |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
430 |
HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
431 |
HG_PHASES_MOVED=1 |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
432 |
HG_SOURCE=pull |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
433 |
HG_TXNID=TXN:$ID$ |
41896
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
434 |
HG_TXNNAME=pull |
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41638
diff
changeset
|
435 |
file:/*/$TESTTMP/repo (glob) |
41638
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
436 |
HG_URL=file:$TESTTMP/repo |
e8a71ed9c373
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents:
35570
diff
changeset
|
437 |
|
22961
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
438 |
pullop.cgresult is -2 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
439 |
(run 'hg update' to get a working copy) |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
440 |
$ hg log -G |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
441 |
o 9:9d18e5bd9ab0 public test H |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
442 |
| |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
443 |
o 8:71bd7b46de72 public test Merge |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
444 |
|\ |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
445 |
| o 7:5cd59d311f65 public test H |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
446 |
| | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
447 |
o | 6:1d14c3ce6ac0 public test G |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
448 |
| | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
449 |
| | o 5:7f219660301f public test F |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
450 |
| | | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
451 |
+---o 4:8a5212ebc852 public test E |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
452 |
| | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
453 |
| o 3:b3325c91a4d9 public test D |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
454 |
| | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
455 |
| @ 2:f838bfaca5c7 public test C |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
456 |
|/ |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
457 |
o 1:27547f69f254 public test B |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
458 |
| |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
459 |
o 0:4a2df7238c3b public test A |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
460 |