Mercurial > hg
annotate tests/test-bundle2-multiple-changegroups.t @ 26750:9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
Before this patch, external editor process for the commit log can't
view some in-memory changes (especially, of dirstate), because they
aren't written out until the end of transaction (or wlock).
This causes unexpected output of Mercurial commands spawned from that
editor process.
To make in-memory changes visible to external editor process, this
patch does:
- write (or schedule to write) in-memory dirstate changes, and
- set HG_PENDING environment variable, if:
- a transaction is running, and
- there are in-memory changes to be visible
"hg diff" spawned from external editor process for "hg qrefresh"
shows:
- "changes newly imported into the topmost" before 49148d7868df(*)
- "all changes recorded in the topmost by refreshing" after this patch
(*) 49148d7868df changed steps invoking editor process
Even though backward compatibility may be broken, the latter behavior
looks reasonable, because "hg diff" spawned from the editor process
consistently shows "what changes new revision records" regardless of
invocation context.
In fact, issue4378 itself should be resolved by 800e090e9c64, which
made 'repo.transaction()' write in-memory dirstate changes out
explicitly before starting transaction. It also made "hg qrefresh"
imply 'dirstate.write()' before external editor invocation in call
chain below.
- mq.queue.refresh
- strip.strip
- repair.strip
- localrepository.transaction
- dirstate.write
- localrepository.commit
- invoke external editor
Though, this patch has '(issue4378)' in own summary line to indicate
that issues like issue4378 should be fixed by this.
BTW, this patch adds '-m' option to a 'hg ci --amend' execution in
'test-commit-amend.t', to avoid invoking external editor process.
In this case, "unsure" states may be changed to "clean" according to
timestamp or so on. These changes should be written into pending file,
if external editor invocation is required,
Then, writing dirstate changes out breaks stability of test, because
it shows "transaction abort!/rollback completed" occasionally.
Aborting after editor process invocation while commands below may
cause similar instability of tests, too (AFAIK, there is no more such
one, at this revision)
- commit --amend
- without --message/--logfile
- import
- without --message/--logfile,
- without --no-commit,
- without --bypass,
- one of below, and
- patch has no description text, or
- with --edit
- aborting at the 1st patch, which adds or removes file(s)
- if it only changes existing files, status is checked only for
changed files by 'scmutil.matchfiles()', and transition from
"unsure" to "normal" in dirstate doesn't occur (= dirstate
isn't changed, and written out)
- aborting at the 2nd or later patch implies other pending
changes (e.g. changelog), and always causes showing
"transaction abort!/rollback completed"
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Sat, 17 Oct 2015 01:15:34 +0900 |
parents | d19787db6fe0 |
children | d6d3cf5fda6f |
rev | line source |
---|---|
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 > """ |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
6 > from mercurial import changegroup, exchange |
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] |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
15 > cg = changegroup.getchangegroup(repo, source, heads=intermediates, |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
16 > common=common, bundlecaps=bundlecaps) |
24686
e0e28e910fa3
bundle2: rename format, parts and config to final names
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22972
diff
changeset
|
17 > bundler.newpart('output', data='changegroup1') |
e0e28e910fa3
bundle2: rename format, parts and config to final names
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22972
diff
changeset
|
18 > bundler.newpart('changegroup', data=cg.getchunks()) |
22961
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
19 > cg = changegroup.getchangegroup(repo, source, heads=heads, |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
20 > common=common + intermediates, |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
21 > bundlecaps=bundlecaps) |
24686
e0e28e910fa3
bundle2: rename format, parts and config to final names
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22972
diff
changeset
|
22 > bundler.newpart('output', data='changegroup2') |
e0e28e910fa3
bundle2: rename format, parts and config to final names
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22972
diff
changeset
|
23 > bundler.newpart('changegroup', data=cg.getchunks()) |
22961
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
24 > |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
25 > def _pull(repo, *args, **kwargs): |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
26 > pullop = _orig_pull(repo, *args, **kwargs) |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
27 > repo.ui.write('pullop.cgresult is %d\n' % pullop.cgresult) |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
28 > return pullop |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
29 > |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
30 > _orig_pull = exchange.pull |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
31 > exchange.pull = _pull |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
32 > exchange.getbundle2partsmapping['changegroup'] = _getbundlechangegrouppart |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
33 > EOF |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
34 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
35 $ cat >> $HGRCPATH << EOF |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
36 > [experimental] |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
37 > bundle2-exp=True |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
38 > [ui] |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
39 > 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
|
40 > EOF |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
41 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
42 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
|
43 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
44 $ hg init repo |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
45 $ cd repo |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
46 $ cat > .hg/hgrc << EOF |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
47 > [extensions] |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
48 > bundle2=$TESTTMP/bundle2.py |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
49 > EOF |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
50 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
51 $ echo A > A |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
52 $ hg commit -A -m A -q |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
53 $ cd .. |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
54 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
55 Clone |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
56 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
57 $ hg clone -q repo clone |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
58 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
59 Add two linear commits |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
60 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
61 $ cd repo |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
62 $ echo B > B |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
63 $ hg commit -A -m B -q |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
64 $ echo C > C |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
65 $ hg commit -A -m C -q |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
66 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
67 $ cd ../clone |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
68 $ cat >> .hg/hgrc <<EOF |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
69 > [hooks] |
25478
d19787db6fe0
tests: simplify printenv calls
Matt Mackall <mpm@selenic.com>
parents:
24740
diff
changeset
|
70 > pretxnchangegroup = sh -c "printenv.py pretxnchangegroup" |
d19787db6fe0
tests: simplify printenv calls
Matt Mackall <mpm@selenic.com>
parents:
24740
diff
changeset
|
71 > changegroup = sh -c "printenv.py changegroup" |
d19787db6fe0
tests: simplify printenv calls
Matt Mackall <mpm@selenic.com>
parents:
24740
diff
changeset
|
72 > incoming = sh -c "printenv.py incoming" |
22961
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
73 > EOF |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
74 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
75 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
|
76 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
77 $ hg pull |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
78 pulling from $TESTTMP/repo (glob) |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
79 searching for changes |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
80 remote: changegroup1 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
81 adding changesets |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
82 adding manifests |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
83 adding file changes |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
84 added 1 changesets with 1 changes to 1 files |
24740
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24686
diff
changeset
|
85 pretxnchangegroup hook: HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_PENDING=$TESTTMP/clone HG_SOURCE=pull HG_TXNID=TXN:* HG_URL=file:$TESTTMP/repo (glob) |
22961
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
86 remote: changegroup2 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
87 adding changesets |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
88 adding manifests |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
89 adding file changes |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
90 added 1 changesets with 1 changes to 1 files |
24740
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24686
diff
changeset
|
91 pretxnchangegroup hook: HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 HG_PENDING=$TESTTMP/clone HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:* HG_URL=file:$TESTTMP/repo (glob) |
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24686
diff
changeset
|
92 changegroup hook: HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_SOURCE=pull HG_TXNID=TXN:* HG_URL=file:$TESTTMP/repo (glob) |
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24686
diff
changeset
|
93 incoming hook: HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_SOURCE=pull HG_TXNID=TXN:* HG_URL=file:$TESTTMP/repo (glob) |
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24686
diff
changeset
|
94 changegroup hook: HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:* HG_URL=file:$TESTTMP/repo (glob) |
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24686
diff
changeset
|
95 incoming hook: HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:* HG_URL=file:$TESTTMP/repo (glob) |
22961
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
96 pullop.cgresult is 1 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
97 (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
|
98 $ hg update |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
99 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
|
100 $ hg log -G |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
101 @ 2:f838bfaca5c7 public test C |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
102 | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
103 o 1:27547f69f254 public test B |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
104 | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
105 o 0:4a2df7238c3b public test A |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
106 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
107 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
|
108 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
109 $ cd ../repo |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
110 $ echo D > D |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
111 $ hg commit -A -m D -q |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
112 $ hg up -r 1 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
113 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
|
114 $ echo E > E |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
115 $ hg commit -A -m E -q |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
116 $ echo F > F |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
117 $ hg commit -A -m F -q |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
118 $ hg up -r 1 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
119 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
|
120 $ echo G > G |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
121 $ hg commit -A -m G -q |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
122 $ hg up -r 3 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
123 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
|
124 $ echo H > H |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
125 $ hg commit -A -m H -q |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
126 $ hg log -G |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
127 @ 7:5cd59d311f65 draft test H |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
128 | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
129 | o 6:1d14c3ce6ac0 draft test G |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
130 | | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
131 | | o 5:7f219660301f draft test F |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
132 | | | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
133 | | o 4:8a5212ebc852 draft test E |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
134 | |/ |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
135 o | 3:b3325c91a4d9 draft test D |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
136 | | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
137 o | 2:f838bfaca5c7 draft test C |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
138 |/ |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
139 o 1:27547f69f254 draft test B |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
140 | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
141 o 0:4a2df7238c3b draft test A |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
142 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
143 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
|
144 pullop.cgresult |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
145 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
146 $ cd ../clone |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
147 $ hg pull |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
148 pulling from $TESTTMP/repo (glob) |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
149 searching for changes |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
150 remote: changegroup1 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
151 adding changesets |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
152 adding manifests |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
153 adding file changes |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
154 added 2 changesets with 2 changes to 2 files (+1 heads) |
24740
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24686
diff
changeset
|
155 pretxnchangegroup hook: HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e HG_PENDING=$TESTTMP/clone HG_SOURCE=pull HG_TXNID=TXN:* HG_URL=file:$TESTTMP/repo (glob) |
22961
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
156 remote: changegroup2 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
157 adding changesets |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
158 adding manifests |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
159 adding file changes |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
160 added 3 changesets with 3 changes to 3 files (+1 heads) |
24740
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24686
diff
changeset
|
161 pretxnchangegroup hook: HG_NODE=7f219660301fe4c8a116f714df5e769695cc2b46 HG_PENDING=$TESTTMP/clone HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:* HG_URL=file:$TESTTMP/repo (glob) |
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24686
diff
changeset
|
162 changegroup hook: HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e HG_SOURCE=pull HG_TXNID=TXN:* HG_URL=file:$TESTTMP/repo (glob) |
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24686
diff
changeset
|
163 incoming hook: HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e HG_SOURCE=pull HG_TXNID=TXN:* HG_URL=file:$TESTTMP/repo (glob) |
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24686
diff
changeset
|
164 incoming hook: HG_NODE=8a5212ebc8527f9fb821601504794e3eb11a1ed3 HG_SOURCE=pull HG_TXNID=TXN:* HG_URL=file:$TESTTMP/repo (glob) |
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24686
diff
changeset
|
165 changegroup hook: HG_NODE=7f219660301fe4c8a116f714df5e769695cc2b46 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:* HG_URL=file:$TESTTMP/repo (glob) |
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24686
diff
changeset
|
166 incoming hook: HG_NODE=7f219660301fe4c8a116f714df5e769695cc2b46 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:* HG_URL=file:$TESTTMP/repo (glob) |
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24686
diff
changeset
|
167 incoming hook: HG_NODE=1d14c3ce6ac0582d2809220d33e8cd7a696e0156 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:* HG_URL=file:$TESTTMP/repo (glob) |
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24686
diff
changeset
|
168 incoming hook: HG_NODE=5cd59d311f6508b8e0ed28a266756c859419c9f1 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:* HG_URL=file:$TESTTMP/repo (glob) |
22961
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
169 pullop.cgresult is 3 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
170 (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
|
171 $ hg log -G |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
172 o 7:5cd59d311f65 public test H |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
173 | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
174 | o 6:1d14c3ce6ac0 public test G |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
175 | | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
176 | | o 5:7f219660301f public test F |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
177 | | | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
178 | | o 4:8a5212ebc852 public test E |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
179 | |/ |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
180 o | 3:b3325c91a4d9 public test D |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
181 | | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
182 @ | 2:f838bfaca5c7 public test C |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
183 |/ |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
184 o 1:27547f69f254 public test B |
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 0:4a2df7238c3b public test A |
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 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
|
189 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
190 $ cd ../repo |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
191 $ hg merge -r 6 -q |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
192 $ hg commit -m Merge |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
193 $ echo I > I |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
194 $ hg commit -A -m H -q |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
195 $ hg log -G |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
196 @ 9:9d18e5bd9ab0 draft test H |
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 8:71bd7b46de72 draft test Merge |
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 | o 7:5cd59d311f65 draft test H |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
201 | | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
202 o | 6:1d14c3ce6ac0 draft test G |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
203 | | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
204 | | o 5:7f219660301f draft test F |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
205 | | | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
206 +---o 4:8a5212ebc852 draft test E |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
207 | | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
208 | o 3:b3325c91a4d9 draft test D |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
209 | | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
210 | o 2:f838bfaca5c7 draft test C |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
211 |/ |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
212 o 1:27547f69f254 draft test B |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
213 | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
214 o 0:4a2df7238c3b draft test A |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
215 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
216 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
|
217 pullop.cgresult |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
218 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
219 $ cd ../clone |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
220 $ hg pull |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
221 pulling from $TESTTMP/repo (glob) |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
222 searching for changes |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
223 remote: changegroup1 |
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 1 changesets with 0 changes to 0 files (-1 heads) |
24740
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24686
diff
changeset
|
228 pretxnchangegroup hook: HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_PENDING=$TESTTMP/clone HG_SOURCE=pull HG_TXNID=TXN:* HG_URL=file:$TESTTMP/repo (glob) |
22961
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
229 remote: changegroup2 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
230 adding changesets |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
231 adding manifests |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
232 adding file changes |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
233 added 1 changesets with 1 changes to 1 files |
24740
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24686
diff
changeset
|
234 pretxnchangegroup hook: HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_PENDING=$TESTTMP/clone HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:* HG_URL=file:$TESTTMP/repo (glob) |
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24686
diff
changeset
|
235 changegroup hook: HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_SOURCE=pull HG_TXNID=TXN:* HG_URL=file:$TESTTMP/repo (glob) |
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24686
diff
changeset
|
236 incoming hook: HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_SOURCE=pull HG_TXNID=TXN:* HG_URL=file:$TESTTMP/repo (glob) |
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24686
diff
changeset
|
237 changegroup hook: HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:* HG_URL=file:$TESTTMP/repo (glob) |
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24686
diff
changeset
|
238 incoming hook: HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:* HG_URL=file:$TESTTMP/repo (glob) |
22961
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
239 pullop.cgresult is -2 |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
240 (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
|
241 $ hg log -G |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
242 o 9:9d18e5bd9ab0 public test H |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
243 | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
244 o 8:71bd7b46de72 public test Merge |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
245 |\ |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
246 | o 7:5cd59d311f65 public test H |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
247 | | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
248 o | 6:1d14c3ce6ac0 public test G |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
249 | | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
250 | | o 5:7f219660301f public test F |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
251 | | | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
252 +---o 4:8a5212ebc852 public test E |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
253 | | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
254 | o 3:b3325c91a4d9 public test D |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
255 | | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
256 | @ 2:f838bfaca5c7 public test C |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
257 |/ |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
258 o 1:27547f69f254 public test B |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
259 | |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
260 o 0:4a2df7238c3b public test A |
a67ea4959ef5
bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff
changeset
|
261 |