author | Pierre-Yves David <pierre-yves.david@octobus.net> |
Wed, 14 Apr 2021 01:26:44 +0200 | |
changeset 46931 | d4e4ccb75f99 |
parent 46778 | 066b8d8f75b8 |
child 46948 | 946db89607c8 |
permissions | -rw-r--r-- |
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 |
|
46778
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
173 |
$ 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
|
174 |
pushing to ./branch-E-push |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
175 |
searching for changes |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
176 |
adding changesets |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
177 |
adding manifests |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
178 |
adding file changes |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
179 |
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
|
180 |
pushing to ./branch-G-push |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
181 |
searching for changes |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
182 |
adding changesets |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
183 |
adding manifests |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
184 |
adding file changes |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
185 |
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
|
186 |
pushing to ./branch-H-push |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
187 |
searching for changes |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
188 |
adding changesets |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
189 |
adding manifests |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
190 |
adding file changes |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
191 |
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
|
192 |
$ 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
|
193 |
o H 7 |
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 E 4 |
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 D 3 |
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 C 2 |
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 G 6 |
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 |
| o F 5 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
204 |
|/ |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
205 |
o B 1 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
206 |
| |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
207 |
o A 0 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
208 |
|
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
209 |
$ 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
|
210 |
o H 7 |
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 E 6 |
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 |
| o D 5 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
215 |
|/ |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
216 |
o C 4 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
217 |
| |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
218 |
| o G 3 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
219 |
| | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
220 |
| o F 2 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
221 |
|/ |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
222 |
o B 1 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
223 |
| |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
224 |
o A 0 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
225 |
|
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
226 |
$ 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
|
227 |
o G 7 |
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 F 6 |
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 |
| o E 5 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
232 |
| | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
233 |
| o D 4 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
234 |
| | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
235 |
| | o H 3 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
236 |
| |/ |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
237 |
| o C 2 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
238 |
|/ |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
239 |
o B 1 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
240 |
| |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
241 |
o A 0 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
242 |
|
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
243 |
$ rm -rf ./*-push |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
244 |
|
46764
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
245 |
Test operation with a target |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
246 |
============================ |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
247 |
|
46778
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
248 |
pull |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
249 |
---- |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
250 |
|
46764
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
251 |
$ 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
|
252 |
adding changesets |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
253 |
adding manifests |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
254 |
adding file changes |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
255 |
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
|
256 |
new changesets 4a2df7238c3b |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
257 |
|
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
258 |
pulling an explicite revision |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
259 |
|
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
260 |
$ 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
|
261 |
$ 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
|
262 |
pulling from ./branch-E |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
263 |
searching for changes |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
264 |
adding changesets |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
265 |
adding manifests |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
266 |
adding file changes |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
267 |
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
|
268 |
new changesets 27547f69f254 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
269 |
(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
|
270 |
pulling from ./branch-G |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
271 |
no changes found |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
272 |
pulling from ./branch-H |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
273 |
no changes found |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
274 |
$ 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
|
275 |
o B 1 |
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 A 0 |
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 |
|
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
280 |
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
|
281 |
different repositories. |
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 |
$ 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
|
284 |
pulling from ./branch-E |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
285 |
searching for changes |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
286 |
adding changesets |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
287 |
adding manifests |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
288 |
adding file changes |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
289 |
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
|
290 |
new changesets f838bfaca5c7:a603bfb5a83e |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
291 |
(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
|
292 |
pulling from ./branch-G |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
293 |
searching for changes |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
294 |
adding changesets |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
295 |
adding manifests |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
296 |
adding file changes |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
297 |
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
|
298 |
new changesets 2f3a4c5c1417:c521a06b234b |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
299 |
(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
|
300 |
pulling from ./branch-H |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
301 |
searching for changes |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
302 |
adding changesets |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
303 |
adding manifests |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
304 |
adding file changes |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
305 |
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
|
306 |
new changesets 40faebb2ec45 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
307 |
(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
|
308 |
$ 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
|
309 |
o H 7 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
310 |
| |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
311 |
| o E 4 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
312 |
| | |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
313 |
| o D 3 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
314 |
|/ |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
315 |
o C 2 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
316 |
| |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
317 |
| o G 6 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
318 |
| | |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
319 |
| o F 5 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
320 |
|/ |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
321 |
o B 1 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
322 |
| |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
323 |
o A 0 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
324 |
|
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
325 |
|
46778
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
326 |
push |
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 |
|
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
329 |
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
|
330 |
|
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
331 |
$ 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
|
332 |
$ 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
|
333 |
$ 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
|
334 |
$ 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
|
335 |
comparing with ./branch-E-push |
d4e4ccb75f99
outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46778
diff
changeset
|
336 |
searching for changes |
d4e4ccb75f99
outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46778
diff
changeset
|
337 |
comparing with ./branch-G-push |
d4e4ccb75f99
outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46778
diff
changeset
|
338 |
searching for changes |
d4e4ccb75f99
outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46778
diff
changeset
|
339 |
comparing with ./branch-H-push |
d4e4ccb75f99
outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46778
diff
changeset
|
340 |
searching for changes |
d4e4ccb75f99
outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46778
diff
changeset
|
341 |
no changes found |
d4e4ccb75f99
outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46778
diff
changeset
|
342 |
o changeset: 7:40faebb2ec45 |
d4e4ccb75f99
outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46778
diff
changeset
|
343 |
| tag: tip |
d4e4ccb75f99
outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46778
diff
changeset
|
344 |
| parent: 2:f838bfaca5c7 |
d4e4ccb75f99
outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46778
diff
changeset
|
345 |
| user: test |
d4e4ccb75f99
outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46778
diff
changeset
|
346 |
| 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
|
347 |
| summary: H |
d4e4ccb75f99
outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46778
diff
changeset
|
348 |
| |
d4e4ccb75f99
outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46778
diff
changeset
|
349 |
o changeset: 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: C |
d4e4ccb75f99
outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46778
diff
changeset
|
353 |
|
46778
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
354 |
$ 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
|
355 |
pushing to ./branch-E-push |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
356 |
searching for changes |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
357 |
adding changesets |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
358 |
adding manifests |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
359 |
adding file changes |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
360 |
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
|
361 |
pushing to ./branch-G-push |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
362 |
searching for changes |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
363 |
adding changesets |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
364 |
adding manifests |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
365 |
adding file changes |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
366 |
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
|
367 |
pushing to ./branch-H-push |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
368 |
searching for changes |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
369 |
no changes found |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
370 |
$ 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
|
371 |
o H 5 |
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 E 4 |
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 D 3 |
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 C 2 |
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 B 1 |
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 |
o A 0 |
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 |
$ 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
|
384 |
o H 5 |
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 C 4 |
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 G 3 |
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 F 2 |
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 B 1 |
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 |
o A 0 |
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 |
$ 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
|
397 |
o H 3 |
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 C 2 |
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 B 1 |
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 |
o A 0 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
404 |
|
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
405 |
$ rm -rf ./*-push |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
406 |
|
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
407 |
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
|
408 |
|
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
409 |
$ 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
|
410 |
$ 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
|
411 |
$ 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
|
412 |
$ 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
|
413 |
comparing with ./branch-G-push |
d4e4ccb75f99
outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46778
diff
changeset
|
414 |
searching for changes |
d4e4ccb75f99
outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46778
diff
changeset
|
415 |
comparing with ./branch-H-push |
d4e4ccb75f99
outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46778
diff
changeset
|
416 |
searching for changes |
d4e4ccb75f99
outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46778
diff
changeset
|
417 |
no changes found |
d4e4ccb75f99
outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46778
diff
changeset
|
418 |
comparing with ./branch-E-push |
d4e4ccb75f99
outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46778
diff
changeset
|
419 |
searching for changes |
d4e4ccb75f99
outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46778
diff
changeset
|
420 |
o changeset: 7:40faebb2ec45 |
d4e4ccb75f99
outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46778
diff
changeset
|
421 |
| tag: tip |
d4e4ccb75f99
outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46778
diff
changeset
|
422 |
| parent: 2:f838bfaca5c7 |
d4e4ccb75f99
outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46778
diff
changeset
|
423 |
| user: test |
d4e4ccb75f99
outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46778
diff
changeset
|
424 |
| 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
|
425 |
| summary: H |
d4e4ccb75f99
outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46778
diff
changeset
|
426 |
| |
d4e4ccb75f99
outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46778
diff
changeset
|
427 |
o changeset: 2:f838bfaca5c7 |
d4e4ccb75f99
outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46778
diff
changeset
|
428 |
user: test |
d4e4ccb75f99
outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46778
diff
changeset
|
429 |
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
|
430 |
summary: C |
d4e4ccb75f99
outgoing: accept multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46778
diff
changeset
|
431 |
|
46778
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
432 |
$ 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
|
433 |
pushing to ./branch-G-push |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
434 |
searching for changes |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
435 |
adding changesets |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
436 |
adding manifests |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
437 |
adding file changes |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
438 |
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
|
439 |
pushing to ./branch-H-push |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
440 |
searching for changes |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
441 |
no changes found |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
442 |
pushing to ./branch-E-push |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
443 |
searching for changes |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
444 |
adding changesets |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
445 |
adding manifests |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
446 |
adding file changes |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
447 |
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
|
448 |
$ 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
|
449 |
o H 5 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
450 |
| |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
451 |
| o E 4 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
452 |
| | |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
453 |
| o D 3 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
454 |
|/ |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
455 |
o C 2 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
456 |
| |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
457 |
o B 1 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
458 |
| |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
459 |
o A 0 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
460 |
|
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
461 |
$ 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
|
462 |
o H 5 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
463 |
| |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
464 |
o C 4 |
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 G 3 |
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 F 2 |
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 B 1 |
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 A 0 |
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 |
$ 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
|
475 |
o H 3 |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
476 |
| |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
477 |
o C 2 |
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 B 1 |
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 A 0 |
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 |
$ rm -rf ./*-push |
066b8d8f75b8
push: allow to specify multiple destinations
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46764
diff
changeset
|
484 |
|
46764
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 |
Test with --update |
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 |
|
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
489 |
update without conflicts |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
490 |
------------------------ |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
491 |
|
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
492 |
$ 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
|
493 |
adding changesets |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
494 |
adding manifests |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
495 |
adding file changes |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
496 |
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
|
497 |
new changesets 4a2df7238c3b |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
498 |
updating to branch default |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
499 |
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
|
500 |
|
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
501 |
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
|
502 |
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
|
503 |
|
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
504 |
$ 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
|
505 |
@ A 0 |
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 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
|
508 |
pulling from ./branch-E |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
509 |
searching for changes |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
510 |
adding changesets |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
511 |
adding manifests |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
512 |
adding file changes |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
513 |
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
|
514 |
new changesets 27547f69f254:a603bfb5a83e |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
515 |
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
|
516 |
pulling from ./branch-G |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
517 |
searching for changes |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
518 |
adding changesets |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
519 |
adding manifests |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
520 |
adding file changes |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
521 |
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
|
522 |
new changesets 2f3a4c5c1417:c521a06b234b |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
523 |
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
|
524 |
updated to "a603bfb5a83e: E" |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
525 |
1 other heads for branch "default" |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
526 |
pulling from ./branch-H |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
527 |
searching for changes |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
528 |
adding changesets |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
529 |
adding manifests |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
530 |
adding file changes |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
531 |
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
|
532 |
new changesets 40faebb2ec45 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
533 |
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
|
534 |
updated to "a603bfb5a83e: E" |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
535 |
2 other heads for branch "default" |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
536 |
$ 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
|
537 |
o H 7 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
538 |
| |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
539 |
| @ E 4 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
540 |
| | |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
541 |
| o D 3 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
542 |
|/ |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
543 |
o C 2 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
544 |
| |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
545 |
| o G 6 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
546 |
| | |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
547 |
| o F 5 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
548 |
|/ |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
549 |
o B 1 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
550 |
| |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
551 |
o A 0 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
552 |
|
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 |
update with conflicts |
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 |
|
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
557 |
$ 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
|
558 |
adding changesets |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
559 |
adding manifests |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
560 |
adding file changes |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
561 |
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
|
562 |
new changesets 4a2df7238c3b |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
563 |
updating to branch default |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
564 |
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
|
565 |
|
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
566 |
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
|
567 |
|
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
568 |
$ 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
|
569 |
$ 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
|
570 |
$ 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
|
571 |
@ A 0 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
572 |
|
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
573 |
$ 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
|
574 |
pulling from ./branch-E |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
575 |
searching for changes |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
576 |
adding changesets |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
577 |
adding manifests |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
578 |
adding file changes |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
579 |
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
|
580 |
new changesets 27547f69f254:a603bfb5a83e |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
581 |
merging D |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
582 |
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
|
583 |
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
|
584 |
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
|
585 |
[1] |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
586 |
$ 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
|
587 |
U D |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
588 |
$ 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
|
589 |
@ E 4 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
590 |
| |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
591 |
o D 3 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
592 |
| |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
593 |
o C 2 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
594 |
| |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
595 |
o B 1 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
596 |
| |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
597 |
% A 0 |
685383486d0a
pull: allow to specify multiple sources
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
598 |