annotate tests/test-exchange-multi-source.t @ 51977:42a116f1cdc1

branchmap-v3: introduce a "stop_rev" argument to `headsrevs` The `headsrevs` method of the revlog already have a `revs` argument to compute the headrevs of a limited set of heads. However, it disable the use of the native compiled code to compute the heads, which slows down the branchmap v3 code a lot. The branchmap v3 usage is actually quite constrained as we will always only ignores a part at the top of the graph. So we could be significantly faster. We start by making small change to the python side to improve the situation and introduce the new API. More collaboration with the native code are coming later. This massively speedup operation and close most of the remaining gaps between branchmap-v3 and branchmap-v2. especially on repository with many revs like mozilla-try. A small overhead remains mostly because the `headrevs` logic currently has some inefficiently. We will look into them from there. ### benchmark.name = hg.command.unbundle # bin-env-vars.hg.py-re2-module = default # benchmark.variants.issue6528 = disabled # benchmark.variants.resource-usage = default # benchmark.variants.reuse-external-delta-parent = yes # benchmark.variants.revs = any-1-extra-rev # benchmark.variants.source = unbundle # benchmark.variants.validate = default # benchmark.variants.verbosity = quiet ## data-env-vars.name = netbeans-2018-08-01-zstd-sparse-revlog # bin-env-vars.hg.flavor = default branch-v2: 0.233711 ~~~~~ branch-v3 before: 0.368769 (+57.79%, +0.14) branch-v3 after: 0.239857 (+2.63%, +0.01) # bin-env-vars.hg.flavor = rust branch-v2: 0.235230 ~~~~~ branch-v3 before: 0.372460 (+58.34%, +0.14) branch-v3 after: 0.240972 (+2.44%, +0.01) ## data-env-vars.name = netbeans-2018-08-01-ds2-pnm # bin-env-vars.hg.flavor = rust branch-v2: 0.255586 ~~~~~ branch-v3 before: 0.318907 (+24.78%, +0.06) branch-v3 after: 0.268560 (+5.08%, +0.01) ## data-env-vars.name = mozilla-central-2024-03-22-zstd-sparse-revlog # bin-env-vars.hg.flavor = default branch-v2: 0.339010 ~~~~~ branch-v3 before: 0.349752 (+3.17%, +0.01) branch-v3 after: 0.349389 (+3.06%, +0.01) # bin-env-vars.hg.flavor = rust branch-v2: 0.346525 ~~~~~ branch-v3 before: 0.354300 (+2.24%, +0.01) branch-v3 after: 0.355661 (+2.64%, +0.01) ## data-env-vars.name = mozilla-central-2024-03-22-ds2-pnm # bin-env-vars.hg.flavor = rust branch-v2: 0.380202 ~~~~~ branch-v3 before: 0.396293 (+4.23%, +0.02) branch-v3 after: 0.408851 (+7.54%, +0.03) ## data-env-vars.name = mozilla-unified-2024-03-22-zstd-sparse-revlog # bin-env-vars.hg.flavor = default branch-v2: 0.412165 ~~~~~ branch-v3 before: 0.424769 (+3.06%, +0.01) branch-v3 after: 0.427782 (+3.79%, +0.02) # bin-env-vars.hg.flavor = rust branch-v2: 0.412397 ~~~~~ branch-v3 before: 0.421796 (+2.28%, +0.01) branch-v3 after: 0.422354 (+2.41%, +0.01) ## data-env-vars.name = mozilla-unified-2024-03-22-ds2-pnm # bin-env-vars.hg.flavor = rust branch-v2: 0.429501 ~~~~~ branch-v3 before: 0.443849 (+3.34%, +0.01) branch-v3 after: 0.443197 (+3.19%, +0.01) ## data-env-vars.name = mozilla-try-2024-03-26-zstd-sparse-revlog # bin-env-vars.hg.flavor = default branch-v2: 3.403171 ~~~~~ branch-v3 before: 6.234055 (+83.18%, +2.83) branch-v3 after: 3.819477 (+12.23%, +0.42) # bin-env-vars.hg.flavor = rust branch-v2: 3.454876 ~~~~~ branch-v3 before: 6.307813 (+82.58%, +2.85) branch-v3 after: 3.590284 (+3.92%, +0.14) ## data-env-vars.name = mozilla-try-2024-03-26-ds2-pnm # bin-env-vars.hg.flavor = rust branch-v2: 3.465435 ~~~~~ branch-v3 before: 5.176076 (+49.36%, +1.71) branch-v3 after: 3.633278 (+4.84%, +0.17)
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 03 Sep 2024 11:11:17 +0200
parents 834f4e9d1af2
children fb15ba66c702
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
46764
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
1 ====================================================
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
2 Test push/pull from multiple source at the same time
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
3 ====================================================
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
4
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
5
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
6 Setup
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
7 =====
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
8
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
9 main repository
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
10 ---------------
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
11
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
12 $ . $RUNTESTDIR/testlib/common.sh
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
13 $ hg init main-repo
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
14 $ cd main-repo
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
15 $ mkcommit A
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
16 $ mkcommit B
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
17 $ mkcommit C
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
18 $ mkcommit D
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
19 $ mkcommit E
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
20 $ hg up 'desc(B)'
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
21 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
22 $ mkcommit F
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
23 created new head
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
24 $ mkcommit G
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
25 $ hg up 'desc(C)'
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
26 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
27 $ mkcommit H
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
28 created new head
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
29 $ hg up null --quiet
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
30 $ hg log -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
31 o H 7
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
32 |
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
33 | o E 4
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
34 | |
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
35 | o D 3
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
36 |/
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
37 o C 2
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
38 |
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
39 | o G 6
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
40 | |
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
41 | o F 5
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
42 |/
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
43 o B 1
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
44 |
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
45 o A 0
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
46
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
47 $ cd ..
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
48
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
49 Various other repositories
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
50 --------------------------
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
51
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
52 $ hg clone main-repo branch-E --rev 4 -U
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
53 adding changesets
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
54 adding manifests
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
55 adding file changes
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
56 added 5 changesets with 5 changes to 5 files
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
57 new changesets 4a2df7238c3b:a603bfb5a83e
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
58 $ hg clone main-repo branch-G --rev 6 -U
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
59 adding changesets
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
60 adding manifests
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
61 adding file changes
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
62 added 4 changesets with 4 changes to 4 files
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
63 new changesets 4a2df7238c3b:c521a06b234b
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
64 $ hg clone main-repo branch-H --rev 7 -U
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
65 adding changesets
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
66 adding manifests
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
67 adding file changes
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
68 added 4 changesets with 4 changes to 4 files
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
69 new changesets 4a2df7238c3b:40faebb2ec45
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
70
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
71 Test simple bare operation
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
72 ==========================
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
73
46778
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
74 pull
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
75 ----
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
76
46764
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
77 $ hg clone main-repo test-repo-bare --rev 0 -U
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
78 adding changesets
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
79 adding manifests
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
80 adding file changes
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
81 added 1 changesets with 1 changes to 1 files
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
82 new changesets 4a2df7238c3b
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
83
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
84 $ hg pull -R test-repo-bare ./branch-E ./branch-G ./branch-H
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
85 pulling from ./branch-E
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
86 searching for changes
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
87 adding changesets
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
88 adding manifests
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
89 adding file changes
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
90 added 4 changesets with 4 changes to 4 files
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
91 new changesets 27547f69f254:a603bfb5a83e
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
92 (run 'hg update' to get a working copy)
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
93 pulling from ./branch-G
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
94 searching for changes
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
95 adding changesets
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
96 adding manifests
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
97 adding file changes
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
98 added 2 changesets with 2 changes to 2 files (+1 heads)
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
99 new changesets 2f3a4c5c1417:c521a06b234b
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
100 (run 'hg heads' to see heads, 'hg merge' to merge)
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
101 pulling from ./branch-H
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
102 searching for changes
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
103 adding changesets
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
104 adding manifests
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
105 adding file changes
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
106 added 1 changesets with 1 changes to 1 files (+1 heads)
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
107 new changesets 40faebb2ec45
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
108 (run 'hg heads .' to see heads, 'hg merge' to merge)
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
109 $ hg log -R test-repo-bare -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
110 o H 7
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
111 |
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
112 | o E 4
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
113 | |
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
114 | o D 3
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
115 |/
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
116 o C 2
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
117 |
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
118 | o G 6
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
119 | |
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
120 | o F 5
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
121 |/
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
122 o B 1
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
123 |
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
124 o A 0
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
125
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
126
46778
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
127 push
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
128 ----
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
129
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
130 $ cp -R ./branch-E ./branch-E-push
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
131 $ cp -R ./branch-G ./branch-G-push
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
132 $ cp -R ./branch-H ./branch-H-push
46931
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
133 $ hg out -G -R test-repo-bare ./branch-E-push ./branch-G-push ./branch-H-push
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
134 comparing with ./branch-E-push
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
135 searching for changes
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
136 comparing with ./branch-G-push
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
137 searching for changes
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
138 comparing with ./branch-H-push
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
139 searching for changes
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
140 o changeset: 7:40faebb2ec45
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
141 | tag: tip
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
142 | parent: 2:f838bfaca5c7
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
143 | user: test
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
144 | date: Thu Jan 01 00:00:00 1970 +0000
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
145 | summary: H
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
146 |
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
147 | o changeset: 6:c521a06b234b
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
148 | | user: test
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
149 | | date: Thu Jan 01 00:00:00 1970 +0000
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
150 | | summary: G
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
151 | |
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
152 | o changeset: 5:2f3a4c5c1417
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
153 | parent: 1:27547f69f254
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
154 | user: test
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
155 | date: Thu Jan 01 00:00:00 1970 +0000
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
156 | summary: F
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
157 |
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
158 | o changeset: 4:a603bfb5a83e
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
159 | | user: test
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
160 | | date: Thu Jan 01 00:00:00 1970 +0000
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
161 | | summary: E
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
162 | |
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
163 | o changeset: 3:b3325c91a4d9
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
164 |/ user: test
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
165 | date: Thu Jan 01 00:00:00 1970 +0000
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
166 | summary: D
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
167 |
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
168 o changeset: 2:f838bfaca5c7
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
169 user: test
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
170 date: Thu Jan 01 00:00:00 1970 +0000
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
171 summary: C
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
172
46948
946db89607c8 bundle: support multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46931
diff changeset
173 $ hg bundle -R test-repo-bare bundle.hg ./branch-E-push ./branch-G-push ./branch-H-push
946db89607c8 bundle: support multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46931
diff changeset
174 searching for changes
946db89607c8 bundle: support multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46931
diff changeset
175 searching for changes
946db89607c8 bundle: support multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46931
diff changeset
176 searching for changes
946db89607c8 bundle: support multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46931
diff changeset
177 6 changesets found
46778
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
178 $ hg push --force -R test-repo-bare ./branch-E-push ./branch-G-push ./branch-H-push
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
179 pushing to ./branch-E-push
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
180 searching for changes
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
181 adding changesets
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
182 adding manifests
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
183 adding file changes
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
184 added 3 changesets with 3 changes to 3 files (+2 heads)
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
185 pushing to ./branch-G-push
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
186 searching for changes
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
187 adding changesets
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
188 adding manifests
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
189 adding file changes
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
190 added 4 changesets with 4 changes to 4 files (+2 heads)
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
191 pushing to ./branch-H-push
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
192 searching for changes
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
193 adding changesets
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
194 adding manifests
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
195 adding file changes
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
196 added 4 changesets with 4 changes to 4 files (+2 heads)
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
197 $ hg log -R ./branch-E-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
198 o H 7
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
199 |
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
200 | o E 4
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
201 | |
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
202 | o D 3
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
203 |/
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
204 o C 2
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
205 |
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
206 | o G 6
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
207 | |
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
208 | o F 5
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
209 |/
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
210 o B 1
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
211 |
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
212 o A 0
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
213
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
214 $ hg log -R ./branch-G-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
215 o H 7
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
216 |
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
217 | o E 6
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
218 | |
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
219 | o D 5
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
220 |/
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
221 o C 4
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
222 |
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
223 | o G 3
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
224 | |
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
225 | o F 2
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
226 |/
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
227 o B 1
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
228 |
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
229 o A 0
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
230
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
231 $ hg log -R ./branch-H-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
232 o G 7
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
233 |
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
234 o F 6
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
235 |
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
236 | o E 5
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
237 | |
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
238 | o D 4
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
239 | |
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
240 | | o H 3
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
241 | |/
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
242 | o C 2
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
243 |/
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
244 o B 1
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
245 |
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
246 o A 0
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
247
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
248 $ rm -rf ./*-push
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
249
46764
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
250 Test operation with a target
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
251 ============================
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
252
46778
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
253 pull
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
254 ----
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
255
46764
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
256 $ hg clone main-repo test-repo-rev --rev 0 -U
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
257 adding changesets
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
258 adding manifests
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
259 adding file changes
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
260 added 1 changesets with 1 changes to 1 files
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
261 new changesets 4a2df7238c3b
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
262
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
263 pulling an explicite revision
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
264
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
265 $ node_b=`hg log -R main-repo --rev 'desc(B)' -T '{node}'`
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
266 $ hg pull -R test-repo-rev ./branch-E ./branch-G ./branch-H --rev $node_b
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
267 pulling from ./branch-E
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
268 searching for changes
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
269 adding changesets
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
270 adding manifests
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
271 adding file changes
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
272 added 1 changesets with 1 changes to 1 files
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
273 new changesets 27547f69f254
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
274 (run 'hg update' to get a working copy)
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
275 pulling from ./branch-G
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
276 no changes found
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
277 pulling from ./branch-H
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
278 no changes found
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
279 $ hg log -R test-repo-rev -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
280 o B 1
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
281 |
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
282 o A 0
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
283
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
284
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
285 pulling a branch head, the branch head resolve to different revision on the
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
286 different repositories.
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
287
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
288 $ hg pull -R test-repo-rev ./branch-E ./branch-G ./branch-H --rev default
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
289 pulling from ./branch-E
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
290 searching for changes
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
291 adding changesets
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
292 adding manifests
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
293 adding file changes
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
294 added 3 changesets with 3 changes to 3 files
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
295 new changesets f838bfaca5c7:a603bfb5a83e
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
296 (run 'hg update' to get a working copy)
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
297 pulling from ./branch-G
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
298 searching for changes
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
299 adding changesets
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
300 adding manifests
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
301 adding file changes
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
302 added 2 changesets with 2 changes to 2 files (+1 heads)
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
303 new changesets 2f3a4c5c1417:c521a06b234b
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
304 (run 'hg heads' to see heads, 'hg merge' to merge)
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
305 pulling from ./branch-H
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
306 searching for changes
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
307 adding changesets
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
308 adding manifests
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
309 adding file changes
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
310 added 1 changesets with 1 changes to 1 files (+1 heads)
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
311 new changesets 40faebb2ec45
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
312 (run 'hg heads .' to see heads, 'hg merge' to merge)
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
313 $ hg log -R test-repo-rev -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
314 o H 7
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
315 |
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
316 | o E 4
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
317 | |
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
318 | o D 3
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
319 |/
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
320 o C 2
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
321 |
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
322 | o G 6
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
323 | |
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
324 | o F 5
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
325 |/
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
326 o B 1
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
327 |
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
328 o A 0
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
329
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
330
46778
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
331 push
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
332 ----
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
333
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
334 We only push a specific branch with --rev
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
335
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
336 $ cp -R ./branch-E ./branch-E-push
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
337 $ cp -R ./branch-G ./branch-G-push
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
338 $ cp -R ./branch-H ./branch-H-push
46931
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
339 $ hg out -G -R test-repo-bare ./branch-E-push ./branch-G-push ./branch-H-push --rev default
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
340 comparing with ./branch-E-push
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
341 searching for changes
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
342 comparing with ./branch-G-push
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
343 searching for changes
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
344 comparing with ./branch-H-push
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
345 searching for changes
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
346 no changes found
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
347 o changeset: 7:40faebb2ec45
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
348 | tag: tip
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
349 | parent: 2:f838bfaca5c7
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
350 | user: test
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
351 | date: Thu Jan 01 00:00:00 1970 +0000
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
352 | summary: H
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
353 |
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
354 o changeset: 2:f838bfaca5c7
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
355 user: test
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
356 date: Thu Jan 01 00:00:00 1970 +0000
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
357 summary: C
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
358
46948
946db89607c8 bundle: support multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46931
diff changeset
359 $ hg bundle -R test-repo-bare bundle.hg ./branch-E-push ./branch-G-push ./branch-H-push --rev default
946db89607c8 bundle: support multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46931
diff changeset
360 searching for changes
946db89607c8 bundle: support multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46931
diff changeset
361 searching for changes
946db89607c8 bundle: support multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46931
diff changeset
362 searching for changes
946db89607c8 bundle: support multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46931
diff changeset
363 2 changesets found
46778
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
364 $ hg push --force -R test-repo-bare ./branch-E-push ./branch-G-push ./branch-H-push --rev default
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
365 pushing to ./branch-E-push
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
366 searching for changes
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
367 adding changesets
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
368 adding manifests
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
369 adding file changes
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
370 added 1 changesets with 1 changes to 1 files (+1 heads)
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
371 pushing to ./branch-G-push
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
372 searching for changes
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
373 adding changesets
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
374 adding manifests
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
375 adding file changes
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
376 added 2 changesets with 2 changes to 2 files (+1 heads)
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
377 pushing to ./branch-H-push
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
378 searching for changes
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
379 no changes found
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
380 $ hg log -R ./branch-E-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
381 o H 5
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
382 |
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
383 | o E 4
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
384 | |
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
385 | o D 3
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
386 |/
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
387 o C 2
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
388 |
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
389 o B 1
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
390 |
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
391 o A 0
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
392
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
393 $ hg log -R ./branch-G-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
394 o H 5
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
395 |
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
396 o C 4
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
397 |
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
398 | o G 3
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
399 | |
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
400 | o F 2
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
401 |/
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
402 o B 1
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
403 |
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
404 o A 0
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
405
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
406 $ hg log -R ./branch-H-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
407 o H 3
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
408 |
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
409 o C 2
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
410 |
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
411 o B 1
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
412 |
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
413 o A 0
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
414
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
415 $ rm -rf ./*-push
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
416
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
417 Same push, but the first one is a no-op
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
418
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
419 $ cp -R ./branch-E ./branch-E-push
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
420 $ cp -R ./branch-G ./branch-G-push
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
421 $ cp -R ./branch-H ./branch-H-push
46931
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
422 $ hg out -G -R test-repo-bare ./branch-G-push ./branch-H-push ./branch-E-push --rev default
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
423 comparing with ./branch-G-push
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
424 searching for changes
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
425 comparing with ./branch-H-push
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
426 searching for changes
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
427 no changes found
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
428 comparing with ./branch-E-push
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
429 searching for changes
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
430 o changeset: 7:40faebb2ec45
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
431 | tag: tip
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
432 | parent: 2:f838bfaca5c7
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
433 | user: test
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
434 | date: Thu Jan 01 00:00:00 1970 +0000
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
435 | summary: H
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
436 |
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
437 o changeset: 2:f838bfaca5c7
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
438 user: test
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
439 date: Thu Jan 01 00:00:00 1970 +0000
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
440 summary: C
d4e4ccb75f99 outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46778
diff changeset
441
46948
946db89607c8 bundle: support multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46931
diff changeset
442 $ hg bundle -R test-repo-bare bundle.hg ./branch-G-push ./branch-H-push ./branch-E-push --rev default
946db89607c8 bundle: support multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46931
diff changeset
443 searching for changes
946db89607c8 bundle: support multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46931
diff changeset
444 searching for changes
946db89607c8 bundle: support multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46931
diff changeset
445 searching for changes
946db89607c8 bundle: support multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46931
diff changeset
446 2 changesets found
46778
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
447 $ hg push --force -R test-repo-bare ./branch-G-push ./branch-H-push ./branch-E-push --rev default
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
448 pushing to ./branch-G-push
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
449 searching for changes
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
450 adding changesets
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
451 adding manifests
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
452 adding file changes
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
453 added 2 changesets with 2 changes to 2 files (+1 heads)
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
454 pushing to ./branch-H-push
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
455 searching for changes
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
456 no changes found
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
457 pushing to ./branch-E-push
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
458 searching for changes
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
459 adding changesets
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
460 adding manifests
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
461 adding file changes
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
462 added 1 changesets with 1 changes to 1 files (+1 heads)
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
463 $ hg log -R ./branch-E-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
464 o H 5
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
465 |
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
466 | o E 4
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
467 | |
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
468 | o D 3
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
469 |/
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
470 o C 2
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
471 |
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
472 o B 1
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
473 |
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
474 o A 0
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
475
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
476 $ hg log -R ./branch-G-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
477 o H 5
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
478 |
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
479 o C 4
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
480 |
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
481 | o G 3
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
482 | |
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
483 | o F 2
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
484 |/
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
485 o B 1
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
486 |
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
487 o A 0
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
488
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
489 $ hg log -R ./branch-H-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
490 o H 3
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
491 |
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
492 o C 2
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
493 |
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
494 o B 1
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
495 |
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
496 o A 0
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
497
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
498 $ rm -rf ./*-push
066b8d8f75b8 push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46764
diff changeset
499
46764
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
500
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
501 Test with --update
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
502 ==================
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
503
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
504 update without conflicts
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
505 ------------------------
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
506
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
507 $ hg clone main-repo test-repo-update --rev 0
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
508 adding changesets
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
509 adding manifests
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
510 adding file changes
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
511 added 1 changesets with 1 changes to 1 files
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
512 new changesets 4a2df7238c3b
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
513 updating to branch default
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
514 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
515
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
516 We update for each pull, so the first on get into a branch independant from the
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
517 other and stay there. This is the expected behavior.
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
518
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
519 $ hg log -R test-repo-update -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
520 @ A 0
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
521
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
522 $ hg pull -R test-repo-update ./branch-E ./branch-G ./branch-H --update
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
523 pulling from ./branch-E
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
524 searching for changes
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
525 adding changesets
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
526 adding manifests
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
527 adding file changes
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
528 added 4 changesets with 4 changes to 4 files
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
529 new changesets 27547f69f254:a603bfb5a83e
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
530 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
531 pulling from ./branch-G
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
532 searching for changes
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
533 adding changesets
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
534 adding manifests
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
535 adding file changes
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
536 added 2 changesets with 2 changes to 2 files (+1 heads)
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
537 new changesets 2f3a4c5c1417:c521a06b234b
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
538 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
539 updated to "a603bfb5a83e: E"
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
540 1 other heads for branch "default"
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
541 pulling from ./branch-H
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
542 searching for changes
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
543 adding changesets
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
544 adding manifests
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
545 adding file changes
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
546 added 1 changesets with 1 changes to 1 files (+1 heads)
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
547 new changesets 40faebb2ec45
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
548 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
549 updated to "a603bfb5a83e: E"
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
550 2 other heads for branch "default"
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
551 $ hg log -R test-repo-update -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
552 o H 7
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
553 |
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
554 | @ E 4
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
555 | |
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
556 | o D 3
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
557 |/
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
558 o C 2
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
559 |
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
560 | o G 6
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
561 | |
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
562 | o F 5
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
563 |/
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
564 o B 1
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
565 |
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
566 o A 0
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
567
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
568
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
569 update with conflicts
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
570 ---------------------
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
571
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
572 $ hg clone main-repo test-repo-conflict --rev 0
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
573 adding changesets
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
574 adding manifests
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
575 adding file changes
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
576 added 1 changesets with 1 changes to 1 files
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
577 new changesets 4a2df7238c3b
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
578 updating to branch default
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
579 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
580
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
581 The update has conflict and interrupt the pull.
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
582
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
583 $ echo this-will-conflict > test-repo-conflict/D
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
584 $ hg add -R test-repo-conflict test-repo-conflict/D
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
585 $ hg log -R test-repo-conflict -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
586 @ A 0
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
587
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
588 $ hg pull -R test-repo-conflict ./branch-E ./branch-G ./branch-H --update
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
589 pulling from ./branch-E
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
590 searching for changes
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
591 adding changesets
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
592 adding manifests
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
593 adding file changes
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
594 added 4 changesets with 4 changes to 4 files
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
595 new changesets 27547f69f254:a603bfb5a83e
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
596 merging D
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
597 warning: conflicts while merging D! (edit, then use 'hg resolve --mark')
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
598 3 files updated, 0 files merged, 0 files removed, 1 files unresolved
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
599 use 'hg resolve' to retry unresolved file merges
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
600 [1]
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
601 $ hg -R test-repo-conflict resolve -l
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
602 U D
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
603 $ hg log -R test-repo-conflict -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
604 @ E 4
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
605 |
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
606 o D 3
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
607 |
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
608 o C 2
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
609 |
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
610 o B 1
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
611 |
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
612 % A 0
685383486d0a pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
613
47273
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
614
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
615 Testing multi-path definition
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
616 ----------------------------
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
617
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
618 $ hg clone main-repo repo-paths --rev 0
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
619 adding changesets
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
620 adding manifests
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
621 adding file changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
622 added 1 changesets with 1 changes to 1 files
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
623 new changesets 4a2df7238c3b
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
624 updating to branch default
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
625 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
626 $ cp -R ./branch-E ./branch-E-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
627 $ cp -R ./branch-G ./branch-G-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
628 $ cp -R ./branch-H ./branch-H-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
629 $ cat << EOF >> repo-paths/.hg/hgrc
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
630 > [paths]
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
631 > E=../branch-E-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
632 > G=../branch-G-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
633 > H=../branch-H-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
634 > EHG=path://E,path://H,path://G
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
635 > EHG:multi-urls=yes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
636 > GEH=path://G,path://E,path://H
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
637 > GEH:multi-urls=yes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
638 > EOF
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
639
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
640 Do various operations and verify that order matters
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
641
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
642 $ hg -R repo-paths push EHG --force
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
643 pushing to $TESTTMP/branch-E-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
644 searching for changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
645 no changes found
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
646 pushing to $TESTTMP/branch-H-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
647 searching for changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
648 no changes found
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
649 pushing to $TESTTMP/branch-G-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
650 searching for changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
651 no changes found
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
652 [1]
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
653 $ hg -R repo-paths push GEH --force
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
654 pushing to $TESTTMP/branch-G-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
655 searching for changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
656 no changes found
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
657 pushing to $TESTTMP/branch-E-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
658 searching for changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
659 no changes found
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
660 pushing to $TESTTMP/branch-H-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
661 searching for changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
662 no changes found
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
663 [1]
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
664 $ hg -R repo-paths push EHG GEH --force
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
665 pushing to $TESTTMP/branch-E-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
666 searching for changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
667 no changes found
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
668 pushing to $TESTTMP/branch-H-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
669 searching for changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
670 no changes found
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
671 pushing to $TESTTMP/branch-G-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
672 searching for changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
673 no changes found
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
674 pushing to $TESTTMP/branch-G-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
675 searching for changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
676 no changes found
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
677 pushing to $TESTTMP/branch-E-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
678 searching for changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
679 no changes found
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
680 pushing to $TESTTMP/branch-H-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
681 searching for changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
682 no changes found
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
683 [1]
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
684 $ hg -R repo-paths pull EHG
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
685 pulling from $TESTTMP/branch-E-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
686 searching for changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
687 adding changesets
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
688 adding manifests
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
689 adding file changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
690 added 4 changesets with 4 changes to 4 files
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
691 new changesets 27547f69f254:a603bfb5a83e
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
692 (run 'hg update' to get a working copy)
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
693 pulling from $TESTTMP/branch-H-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
694 searching for changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
695 adding changesets
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
696 adding manifests
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
697 adding file changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
698 added 1 changesets with 1 changes to 1 files (+1 heads)
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
699 new changesets 40faebb2ec45
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
700 (run 'hg heads' to see heads, 'hg merge' to merge)
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
701 pulling from $TESTTMP/branch-G-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
702 searching for changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
703 adding changesets
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
704 adding manifests
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
705 adding file changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
706 added 2 changesets with 2 changes to 2 files (+1 heads)
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
707 new changesets 2f3a4c5c1417:c521a06b234b
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
708 (run 'hg heads .' to see heads, 'hg merge' to merge)
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
709 $ hg -R repo-paths pull GEH
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
710 pulling from $TESTTMP/branch-G-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
711 searching for changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
712 no changes found
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
713 pulling from $TESTTMP/branch-E-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
714 searching for changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
715 no changes found
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
716 pulling from $TESTTMP/branch-H-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
717 searching for changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
718 no changes found
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
719 $ hg -R repo-paths pull EHG GEH
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
720 pulling from $TESTTMP/branch-E-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
721 searching for changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
722 no changes found
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
723 pulling from $TESTTMP/branch-H-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
724 searching for changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
725 no changes found
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
726 pulling from $TESTTMP/branch-G-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
727 searching for changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
728 no changes found
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
729 pulling from $TESTTMP/branch-G-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
730 searching for changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
731 no changes found
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
732 pulling from $TESTTMP/branch-E-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
733 searching for changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
734 no changes found
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
735 pulling from $TESTTMP/branch-H-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
736 searching for changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
737 no changes found
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
738 $ hg -R repo-paths push EHG --force
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
739 pushing to $TESTTMP/branch-E-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
740 searching for changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
741 adding changesets
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
742 adding manifests
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
743 adding file changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
744 added 3 changesets with 3 changes to 3 files (+2 heads)
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
745 pushing to $TESTTMP/branch-H-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
746 searching for changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
747 adding changesets
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
748 adding manifests
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
749 adding file changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
750 added 4 changesets with 4 changes to 4 files (+2 heads)
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
751 pushing to $TESTTMP/branch-G-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
752 searching for changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
753 adding changesets
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
754 adding manifests
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
755 adding file changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
756 added 4 changesets with 4 changes to 4 files (+2 heads)
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
757 $ hg -R repo-paths push GEH --force
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
758 pushing to $TESTTMP/branch-G-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
759 searching for changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
760 no changes found
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
761 pushing to $TESTTMP/branch-E-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
762 searching for changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
763 no changes found
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
764 pushing to $TESTTMP/branch-H-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
765 searching for changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
766 no changes found
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
767 [1]
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
768 $ hg -R repo-paths push EHG GEH --force
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
769 pushing to $TESTTMP/branch-E-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
770 searching for changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
771 no changes found
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
772 pushing to $TESTTMP/branch-H-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
773 searching for changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
774 no changes found
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
775 pushing to $TESTTMP/branch-G-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
776 searching for changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
777 no changes found
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
778 pushing to $TESTTMP/branch-G-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
779 searching for changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
780 no changes found
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
781 pushing to $TESTTMP/branch-E-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
782 searching for changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
783 no changes found
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
784 pushing to $TESTTMP/branch-H-paths
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
785 searching for changes
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
786 no changes found
834f4e9d1af2 multi-urls: add a boolean suboption that unlock path specification as list
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46948
diff changeset
787 [1]