Mercurial > hg
annotate tests/test-exchange-multi-source.t @ 46874:84a93fa7ecfd
revlog-compression: use zstd by default (if available)
As see in changeset bb271ec2fbfb, zstd is 20% to 50% faster for reading and
writing.
Use take advantage of the new config behavior to try zstd by default, falling
back to zlib is zstd is not available on that plateform.
Differential Revision: https://phab.mercurial-scm.org/D10326
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 06 Apr 2021 18:55:19 +0200 |
parents | 066b8d8f75b8 |
children | d4e4ccb75f99 |
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 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
133 $ 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
|
134 pushing to ./branch-E-push |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
135 searching for changes |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
136 adding changesets |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
137 adding manifests |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
138 adding file changes |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
139 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
|
140 pushing to ./branch-G-push |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
141 searching for changes |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
142 adding changesets |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
143 adding manifests |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
144 adding file changes |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
145 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
|
146 pushing to ./branch-H-push |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
147 searching for changes |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
148 adding changesets |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
149 adding manifests |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
150 adding file changes |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
151 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
|
152 $ 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
|
153 o H 7 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
154 | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
155 | o E 4 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
156 | | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
157 | o D 3 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
158 |/ |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
159 o C 2 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
160 | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
161 | o G 6 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
162 | | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
163 | o F 5 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
164 |/ |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
165 o B 1 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
166 | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
167 o A 0 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
168 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
169 $ 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
|
170 o H 7 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
171 | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
172 | o E 6 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
173 | | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
174 | o D 5 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
175 |/ |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
176 o C 4 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
177 | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
178 | o G 3 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
179 | | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
180 | o F 2 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
181 |/ |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
182 o B 1 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
183 | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
184 o A 0 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
185 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
186 $ 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
|
187 o G 7 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
188 | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
189 o F 6 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
190 | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
191 | o E 5 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
192 | | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
193 | o D 4 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
194 | | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
195 | | o H 3 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
196 | |/ |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
197 | o C 2 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
198 |/ |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
199 o B 1 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
200 | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
201 o A 0 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
202 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
203 $ rm -rf ./*-push |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
204 |
46764
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
205 Test operation with a target |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
206 ============================ |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
207 |
46778
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
208 pull |
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 |
46764
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
211 $ 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
|
212 adding changesets |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
213 adding manifests |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
214 adding file changes |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
215 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
|
216 new changesets 4a2df7238c3b |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
217 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
218 pulling an explicite revision |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
219 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
220 $ 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
|
221 $ 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
|
222 pulling from ./branch-E |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
223 searching for changes |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
224 adding changesets |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
225 adding manifests |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
226 adding file changes |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
227 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
|
228 new changesets 27547f69f254 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
229 (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
|
230 pulling from ./branch-G |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
231 no changes found |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
232 pulling from ./branch-H |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
233 no changes found |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
234 $ 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
|
235 o B 1 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
236 | |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
237 o A 0 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
238 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
239 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
240 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
|
241 different repositories. |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
242 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
243 $ 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
|
244 pulling from ./branch-E |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
245 searching for changes |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
246 adding changesets |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
247 adding manifests |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
248 adding file changes |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
249 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
|
250 new changesets f838bfaca5c7:a603bfb5a83e |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
251 (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
|
252 pulling from ./branch-G |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
253 searching for changes |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
254 adding changesets |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
255 adding manifests |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
256 adding file changes |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
257 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
|
258 new changesets 2f3a4c5c1417:c521a06b234b |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
259 (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
|
260 pulling from ./branch-H |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
261 searching for changes |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
262 adding changesets |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
263 adding manifests |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
264 adding file changes |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
265 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
|
266 new changesets 40faebb2ec45 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
267 (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
|
268 $ 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
|
269 o H 7 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
270 | |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
271 | o E 4 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
272 | | |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
273 | o D 3 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
274 |/ |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
275 o C 2 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
276 | |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
277 | o G 6 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
278 | | |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
279 | o F 5 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
280 |/ |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
281 o B 1 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
282 | |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
283 o A 0 |
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 |
46778
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
286 push |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
287 ---- |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
288 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
289 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
|
290 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
291 $ 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
|
292 $ 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
|
293 $ cp -R ./branch-H ./branch-H-push |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
294 $ 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
|
295 pushing to ./branch-E-push |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
296 searching for changes |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
297 adding changesets |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
298 adding manifests |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
299 adding file changes |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
300 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
|
301 pushing to ./branch-G-push |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
302 searching for changes |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
303 adding changesets |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
304 adding manifests |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
305 adding file changes |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
306 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
|
307 pushing to ./branch-H-push |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
308 searching for changes |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
309 no changes found |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
310 $ 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
|
311 o H 5 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
312 | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
313 | o E 4 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
314 | | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
315 | o D 3 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
316 |/ |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
317 o C 2 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
318 | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
319 o B 1 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
320 | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
321 o A 0 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
322 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
323 $ 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
|
324 o H 5 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
325 | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
326 o C 4 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
327 | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
328 | o G 3 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
329 | | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
330 | o F 2 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
331 |/ |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
332 o B 1 |
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 o A 0 |
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 $ 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
|
337 o H 3 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
338 | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
339 o C 2 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
340 | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
341 o B 1 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
342 | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
343 o A 0 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
344 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
345 $ rm -rf ./*-push |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
346 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
347 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
|
348 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
349 $ 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
|
350 $ 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
|
351 $ cp -R ./branch-H ./branch-H-push |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
352 $ 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
|
353 pushing to ./branch-G-push |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
354 searching for changes |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
355 adding changesets |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
356 adding manifests |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
357 adding file changes |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
358 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
|
359 pushing to ./branch-H-push |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
360 searching for changes |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
361 no changes found |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
362 pushing to ./branch-E-push |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
363 searching for changes |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
364 adding changesets |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
365 adding manifests |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
366 adding file changes |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
367 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
|
368 $ 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
|
369 o H 5 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
370 | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
371 | o E 4 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
372 | | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
373 | o D 3 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
374 |/ |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
375 o C 2 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
376 | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
377 o B 1 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
378 | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
379 o A 0 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
380 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
381 $ 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
|
382 o H 5 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
383 | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
384 o C 4 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
385 | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
386 | o G 3 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
387 | | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
388 | o F 2 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
389 |/ |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
390 o B 1 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
391 | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
392 o A 0 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
393 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
394 $ 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
|
395 o H 3 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
396 | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
397 o C 2 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
398 | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
399 o B 1 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
400 | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
401 o A 0 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
402 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
403 $ rm -rf ./*-push |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
404 |
46764
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
405 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
406 Test with --update |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
407 ================== |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
408 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
409 update without conflicts |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
410 ------------------------ |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
411 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
412 $ 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
|
413 adding changesets |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
414 adding manifests |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
415 adding file changes |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
416 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
|
417 new changesets 4a2df7238c3b |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
418 updating to branch default |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
419 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
|
420 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
421 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
|
422 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
|
423 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
424 $ 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
|
425 @ A 0 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
426 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
427 $ 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
|
428 pulling from ./branch-E |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
429 searching for changes |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
430 adding changesets |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
431 adding manifests |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
432 adding file changes |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
433 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
|
434 new changesets 27547f69f254:a603bfb5a83e |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
435 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
|
436 pulling from ./branch-G |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
437 searching for changes |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
438 adding changesets |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
439 adding manifests |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
440 adding file changes |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
441 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
|
442 new changesets 2f3a4c5c1417:c521a06b234b |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
443 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
|
444 updated to "a603bfb5a83e: E" |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
445 1 other heads for branch "default" |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
446 pulling from ./branch-H |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
447 searching for changes |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
448 adding changesets |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
449 adding manifests |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
450 adding file changes |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
451 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
|
452 new changesets 40faebb2ec45 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
453 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
|
454 updated to "a603bfb5a83e: E" |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
455 2 other heads for branch "default" |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
456 $ 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
|
457 o H 7 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
458 | |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
459 | @ E 4 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
460 | | |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
461 | o D 3 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
462 |/ |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
463 o C 2 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
464 | |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
465 | o G 6 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
466 | | |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
467 | o F 5 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
468 |/ |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
469 o B 1 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
470 | |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
471 o A 0 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
472 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
473 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
474 update with conflicts |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
475 --------------------- |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
476 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
477 $ 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
|
478 adding changesets |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
479 adding manifests |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
480 adding file changes |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
481 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
|
482 new changesets 4a2df7238c3b |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
483 updating to branch default |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
484 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
|
485 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
486 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
|
487 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
488 $ 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
|
489 $ 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
|
490 $ 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
|
491 @ A 0 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
492 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
493 $ 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
|
494 pulling from ./branch-E |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
495 searching for changes |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
496 adding changesets |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
497 adding manifests |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
498 adding file changes |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
499 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
|
500 new changesets 27547f69f254:a603bfb5a83e |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
501 merging D |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
502 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
|
503 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
|
504 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
|
505 [1] |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
506 $ 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
|
507 U D |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
508 $ 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
|
509 @ E 4 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
510 | |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
511 o D 3 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
512 | |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
513 o C 2 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
514 | |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
515 o B 1 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
516 | |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
517 % A 0 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
518 |