Show More
@@ -1,502 +1,511 b'' | |||||
1 | $ "$TESTDIR/hghave" killdaemons || exit 80 |
|
1 | $ "$TESTDIR/hghave" killdaemons || exit 80 | |
2 |
|
2 | |||
3 | Tests discovery against servers without getbundle support: |
|
3 | Tests discovery against servers without getbundle support: | |
4 |
|
4 | |||
5 | $ CAP=getbundle |
|
5 | $ CAP=getbundle | |
6 | $ . "$TESTDIR/notcapable" |
|
6 | $ . "$TESTDIR/notcapable" | |
7 | $ cat >> $HGRCPATH <<EOF |
|
7 | $ cat >> $HGRCPATH <<EOF | |
8 | > [ui] |
|
8 | > [ui] | |
9 | > logtemplate="{rev} {node|short}: {desc} {branches}\n" |
|
9 | > logtemplate="{rev} {node|short}: {desc} {branches}\n" | |
10 | > EOF |
|
10 | > EOF | |
11 |
|
11 | |||
12 | Setup HTTP server control: |
|
12 | Setup HTTP server control: | |
13 |
|
13 | |||
14 | $ remote=http://localhost:$HGPORT/ |
|
14 | $ remote=http://localhost:$HGPORT/ | |
15 | $ export remote |
|
15 | $ export remote | |
16 | $ tstart() { |
|
16 | $ tstart() { | |
17 | > echo '[web]' > $1/.hg/hgrc |
|
17 | > echo '[web]' > $1/.hg/hgrc | |
18 | > echo 'push_ssl = false' >> $1/.hg/hgrc |
|
18 | > echo 'push_ssl = false' >> $1/.hg/hgrc | |
19 | > echo 'allow_push = *' >> $1/.hg/hgrc |
|
19 | > echo 'allow_push = *' >> $1/.hg/hgrc | |
20 | > hg serve -R $1 -p $HGPORT -d --pid-file=hg.pid -E errors.log |
|
20 | > hg serve -R $1 -p $HGPORT -d --pid-file=hg.pid -E errors.log | |
21 | > cat hg.pid >> $DAEMON_PIDS |
|
21 | > cat hg.pid >> $DAEMON_PIDS | |
22 | > } |
|
22 | > } | |
23 | $ tstop() { |
|
23 | $ tstop() { | |
24 | > "$TESTDIR/killdaemons.py" $DAEMON_PIDS |
|
24 | > "$TESTDIR/killdaemons.py" $DAEMON_PIDS | |
25 | > } |
|
25 | > } | |
26 |
|
26 | |||
27 | Both are empty: |
|
27 | Both are empty: | |
28 |
|
28 | |||
29 | $ hg init empty1 |
|
29 | $ hg init empty1 | |
30 | $ hg init empty2 |
|
30 | $ hg init empty2 | |
31 | $ tstart empty2 |
|
31 | $ tstart empty2 | |
|
32 | check if process of pid looks reasonable ('hg' normally, 'python' for run-tests.py -l) | |||
|
33 | #if windows | |||
|
34 | ps of mingw does not support -p, tasklist is on any windows machine since XP | |||
|
35 | $ tasklist //NH //fi "pid eq `cat hg.pid`" | grep ' ' | |||
|
36 | (.* )?(hg|python)\.exe( .*)? (re) | |||
|
37 | #else | |||
|
38 | $ ps --no-heading -p `cat hg.pid` | |||
|
39 | (.* )?(hg|python)( .*)? (re) | |||
|
40 | #endif | |||
32 | $ hg incoming -R empty1 $remote |
|
41 | $ hg incoming -R empty1 $remote | |
33 | comparing with http://localhost:$HGPORT/ |
|
42 | comparing with http://localhost:$HGPORT/ | |
34 | no changes found |
|
43 | no changes found | |
35 | [1] |
|
44 | [1] | |
36 | $ hg outgoing -R empty1 $remote |
|
45 | $ hg outgoing -R empty1 $remote | |
37 | comparing with http://localhost:$HGPORT/ |
|
46 | comparing with http://localhost:$HGPORT/ | |
38 | no changes found |
|
47 | no changes found | |
39 | [1] |
|
48 | [1] | |
40 | $ hg pull -R empty1 $remote |
|
49 | $ hg pull -R empty1 $remote | |
41 | pulling from http://localhost:$HGPORT/ |
|
50 | pulling from http://localhost:$HGPORT/ | |
42 | no changes found |
|
51 | no changes found | |
43 | $ hg push -R empty1 $remote |
|
52 | $ hg push -R empty1 $remote | |
44 | pushing to http://localhost:$HGPORT/ |
|
53 | pushing to http://localhost:$HGPORT/ | |
45 | no changes found |
|
54 | no changes found | |
46 | [1] |
|
55 | [1] | |
47 | $ tstop |
|
56 | $ tstop | |
48 |
|
57 | |||
49 | Base repo: |
|
58 | Base repo: | |
50 |
|
59 | |||
51 | $ hg init main |
|
60 | $ hg init main | |
52 | $ cd main |
|
61 | $ cd main | |
53 | $ hg debugbuilddag -mo '+2:tbase @name1 +3:thead1 <tbase @name2 +4:thead2 @both /thead1 +2:tmaintip' |
|
62 | $ hg debugbuilddag -mo '+2:tbase @name1 +3:thead1 <tbase @name2 +4:thead2 @both /thead1 +2:tmaintip' | |
54 | $ hg log -G |
|
63 | $ hg log -G | |
55 | o 11 a19bfa7e7328: r11 both |
|
64 | o 11 a19bfa7e7328: r11 both | |
56 | | |
|
65 | | | |
57 | o 10 8b6bad1512e1: r10 both |
|
66 | o 10 8b6bad1512e1: r10 both | |
58 | | |
|
67 | | | |
59 | o 9 025829e08038: r9 both |
|
68 | o 9 025829e08038: r9 both | |
60 | |\ |
|
69 | |\ | |
61 | | o 8 d8f638ac69e9: r8 name2 |
|
70 | | o 8 d8f638ac69e9: r8 name2 | |
62 | | | |
|
71 | | | | |
63 | | o 7 b6b4d315a2ac: r7 name2 |
|
72 | | o 7 b6b4d315a2ac: r7 name2 | |
64 | | | |
|
73 | | | | |
65 | | o 6 6c6f5d5f3c11: r6 name2 |
|
74 | | o 6 6c6f5d5f3c11: r6 name2 | |
66 | | | |
|
75 | | | | |
67 | | o 5 70314b29987d: r5 name2 |
|
76 | | o 5 70314b29987d: r5 name2 | |
68 | | | |
|
77 | | | | |
69 | o | 4 e71dbbc70e03: r4 name1 |
|
78 | o | 4 e71dbbc70e03: r4 name1 | |
70 | | | |
|
79 | | | | |
71 | o | 3 2c8d5d5ec612: r3 name1 |
|
80 | o | 3 2c8d5d5ec612: r3 name1 | |
72 | | | |
|
81 | | | | |
73 | o | 2 a7892891da29: r2 name1 |
|
82 | o | 2 a7892891da29: r2 name1 | |
74 | |/ |
|
83 | |/ | |
75 | o 1 0019a3b924fd: r1 |
|
84 | o 1 0019a3b924fd: r1 | |
76 | | |
|
85 | | | |
77 | o 0 d57206cc072a: r0 |
|
86 | o 0 d57206cc072a: r0 | |
78 |
|
87 | |||
79 | $ cd .. |
|
88 | $ cd .. | |
80 | $ tstart main |
|
89 | $ tstart main | |
81 |
|
90 | |||
82 | Full clone: |
|
91 | Full clone: | |
83 |
|
92 | |||
84 | $ hg clone main full |
|
93 | $ hg clone main full | |
85 | updating to branch default |
|
94 | updating to branch default | |
86 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
95 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
87 | $ cd full |
|
96 | $ cd full | |
88 | $ hg incoming $remote |
|
97 | $ hg incoming $remote | |
89 | comparing with http://localhost:$HGPORT/ |
|
98 | comparing with http://localhost:$HGPORT/ | |
90 | searching for changes |
|
99 | searching for changes | |
91 | no changes found |
|
100 | no changes found | |
92 | [1] |
|
101 | [1] | |
93 | $ hg outgoing $remote |
|
102 | $ hg outgoing $remote | |
94 | comparing with http://localhost:$HGPORT/ |
|
103 | comparing with http://localhost:$HGPORT/ | |
95 | searching for changes |
|
104 | searching for changes | |
96 | no changes found |
|
105 | no changes found | |
97 | [1] |
|
106 | [1] | |
98 | $ hg pull $remote |
|
107 | $ hg pull $remote | |
99 | pulling from http://localhost:$HGPORT/ |
|
108 | pulling from http://localhost:$HGPORT/ | |
100 | searching for changes |
|
109 | searching for changes | |
101 | no changes found |
|
110 | no changes found | |
102 | $ hg push $remote |
|
111 | $ hg push $remote | |
103 | pushing to http://localhost:$HGPORT/ |
|
112 | pushing to http://localhost:$HGPORT/ | |
104 | searching for changes |
|
113 | searching for changes | |
105 | no changes found |
|
114 | no changes found | |
106 | [1] |
|
115 | [1] | |
107 | $ cd .. |
|
116 | $ cd .. | |
108 |
|
117 | |||
109 | Local is empty: |
|
118 | Local is empty: | |
110 |
|
119 | |||
111 | $ cd empty1 |
|
120 | $ cd empty1 | |
112 | $ hg incoming $remote |
|
121 | $ hg incoming $remote | |
113 | comparing with http://localhost:$HGPORT/ |
|
122 | comparing with http://localhost:$HGPORT/ | |
114 | 0 d57206cc072a: r0 |
|
123 | 0 d57206cc072a: r0 | |
115 | 1 0019a3b924fd: r1 |
|
124 | 1 0019a3b924fd: r1 | |
116 | 2 a7892891da29: r2 name1 |
|
125 | 2 a7892891da29: r2 name1 | |
117 | 3 2c8d5d5ec612: r3 name1 |
|
126 | 3 2c8d5d5ec612: r3 name1 | |
118 | 4 e71dbbc70e03: r4 name1 |
|
127 | 4 e71dbbc70e03: r4 name1 | |
119 | 5 70314b29987d: r5 name2 |
|
128 | 5 70314b29987d: r5 name2 | |
120 | 6 6c6f5d5f3c11: r6 name2 |
|
129 | 6 6c6f5d5f3c11: r6 name2 | |
121 | 7 b6b4d315a2ac: r7 name2 |
|
130 | 7 b6b4d315a2ac: r7 name2 | |
122 | 8 d8f638ac69e9: r8 name2 |
|
131 | 8 d8f638ac69e9: r8 name2 | |
123 | 9 025829e08038: r9 both |
|
132 | 9 025829e08038: r9 both | |
124 | 10 8b6bad1512e1: r10 both |
|
133 | 10 8b6bad1512e1: r10 both | |
125 | 11 a19bfa7e7328: r11 both |
|
134 | 11 a19bfa7e7328: r11 both | |
126 | $ hg outgoing $remote |
|
135 | $ hg outgoing $remote | |
127 | comparing with http://localhost:$HGPORT/ |
|
136 | comparing with http://localhost:$HGPORT/ | |
128 | no changes found |
|
137 | no changes found | |
129 | [1] |
|
138 | [1] | |
130 | $ hg push $remote |
|
139 | $ hg push $remote | |
131 | pushing to http://localhost:$HGPORT/ |
|
140 | pushing to http://localhost:$HGPORT/ | |
132 | no changes found |
|
141 | no changes found | |
133 | [1] |
|
142 | [1] | |
134 | $ hg pull $remote |
|
143 | $ hg pull $remote | |
135 | pulling from http://localhost:$HGPORT/ |
|
144 | pulling from http://localhost:$HGPORT/ | |
136 | requesting all changes |
|
145 | requesting all changes | |
137 | adding changesets |
|
146 | adding changesets | |
138 | adding manifests |
|
147 | adding manifests | |
139 | adding file changes |
|
148 | adding file changes | |
140 | added 12 changesets with 24 changes to 2 files |
|
149 | added 12 changesets with 24 changes to 2 files | |
141 | (run 'hg update' to get a working copy) |
|
150 | (run 'hg update' to get a working copy) | |
142 | $ hg incoming $remote |
|
151 | $ hg incoming $remote | |
143 | comparing with http://localhost:$HGPORT/ |
|
152 | comparing with http://localhost:$HGPORT/ | |
144 | searching for changes |
|
153 | searching for changes | |
145 | no changes found |
|
154 | no changes found | |
146 | [1] |
|
155 | [1] | |
147 | $ cd .. |
|
156 | $ cd .. | |
148 |
|
157 | |||
149 | Local is subset: |
|
158 | Local is subset: | |
150 |
|
159 | |||
151 | $ hg clone main subset --rev name2 ; cd subset |
|
160 | $ hg clone main subset --rev name2 ; cd subset | |
152 | adding changesets |
|
161 | adding changesets | |
153 | adding manifests |
|
162 | adding manifests | |
154 | adding file changes |
|
163 | adding file changes | |
155 | added 6 changesets with 12 changes to 2 files |
|
164 | added 6 changesets with 12 changes to 2 files | |
156 | updating to branch name2 |
|
165 | updating to branch name2 | |
157 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
166 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
158 | $ hg incoming $remote |
|
167 | $ hg incoming $remote | |
159 | comparing with http://localhost:$HGPORT/ |
|
168 | comparing with http://localhost:$HGPORT/ | |
160 | searching for changes |
|
169 | searching for changes | |
161 | 6 a7892891da29: r2 name1 |
|
170 | 6 a7892891da29: r2 name1 | |
162 | 7 2c8d5d5ec612: r3 name1 |
|
171 | 7 2c8d5d5ec612: r3 name1 | |
163 | 8 e71dbbc70e03: r4 name1 |
|
172 | 8 e71dbbc70e03: r4 name1 | |
164 | 9 025829e08038: r9 both |
|
173 | 9 025829e08038: r9 both | |
165 | 10 8b6bad1512e1: r10 both |
|
174 | 10 8b6bad1512e1: r10 both | |
166 | 11 a19bfa7e7328: r11 both |
|
175 | 11 a19bfa7e7328: r11 both | |
167 | $ hg outgoing $remote |
|
176 | $ hg outgoing $remote | |
168 | comparing with http://localhost:$HGPORT/ |
|
177 | comparing with http://localhost:$HGPORT/ | |
169 | searching for changes |
|
178 | searching for changes | |
170 | no changes found |
|
179 | no changes found | |
171 | [1] |
|
180 | [1] | |
172 | $ hg push $remote |
|
181 | $ hg push $remote | |
173 | pushing to http://localhost:$HGPORT/ |
|
182 | pushing to http://localhost:$HGPORT/ | |
174 | searching for changes |
|
183 | searching for changes | |
175 | no changes found |
|
184 | no changes found | |
176 | [1] |
|
185 | [1] | |
177 | $ hg pull $remote |
|
186 | $ hg pull $remote | |
178 | pulling from http://localhost:$HGPORT/ |
|
187 | pulling from http://localhost:$HGPORT/ | |
179 | searching for changes |
|
188 | searching for changes | |
180 | adding changesets |
|
189 | adding changesets | |
181 | adding manifests |
|
190 | adding manifests | |
182 | adding file changes |
|
191 | adding file changes | |
183 | added 6 changesets with 12 changes to 2 files |
|
192 | added 6 changesets with 12 changes to 2 files | |
184 | (run 'hg update' to get a working copy) |
|
193 | (run 'hg update' to get a working copy) | |
185 | $ hg incoming $remote |
|
194 | $ hg incoming $remote | |
186 | comparing with http://localhost:$HGPORT/ |
|
195 | comparing with http://localhost:$HGPORT/ | |
187 | searching for changes |
|
196 | searching for changes | |
188 | no changes found |
|
197 | no changes found | |
189 | [1] |
|
198 | [1] | |
190 | $ cd .. |
|
199 | $ cd .. | |
191 |
|
200 | |||
192 | Remote is empty: |
|
201 | Remote is empty: | |
193 |
|
202 | |||
194 | $ tstop ; tstart empty2 |
|
203 | $ tstop ; tstart empty2 | |
195 | $ cd main |
|
204 | $ cd main | |
196 | $ hg incoming $remote |
|
205 | $ hg incoming $remote | |
197 | comparing with http://localhost:$HGPORT/ |
|
206 | comparing with http://localhost:$HGPORT/ | |
198 | searching for changes |
|
207 | searching for changes | |
199 | no changes found |
|
208 | no changes found | |
200 | [1] |
|
209 | [1] | |
201 | $ hg outgoing $remote |
|
210 | $ hg outgoing $remote | |
202 | comparing with http://localhost:$HGPORT/ |
|
211 | comparing with http://localhost:$HGPORT/ | |
203 | searching for changes |
|
212 | searching for changes | |
204 | 0 d57206cc072a: r0 |
|
213 | 0 d57206cc072a: r0 | |
205 | 1 0019a3b924fd: r1 |
|
214 | 1 0019a3b924fd: r1 | |
206 | 2 a7892891da29: r2 name1 |
|
215 | 2 a7892891da29: r2 name1 | |
207 | 3 2c8d5d5ec612: r3 name1 |
|
216 | 3 2c8d5d5ec612: r3 name1 | |
208 | 4 e71dbbc70e03: r4 name1 |
|
217 | 4 e71dbbc70e03: r4 name1 | |
209 | 5 70314b29987d: r5 name2 |
|
218 | 5 70314b29987d: r5 name2 | |
210 | 6 6c6f5d5f3c11: r6 name2 |
|
219 | 6 6c6f5d5f3c11: r6 name2 | |
211 | 7 b6b4d315a2ac: r7 name2 |
|
220 | 7 b6b4d315a2ac: r7 name2 | |
212 | 8 d8f638ac69e9: r8 name2 |
|
221 | 8 d8f638ac69e9: r8 name2 | |
213 | 9 025829e08038: r9 both |
|
222 | 9 025829e08038: r9 both | |
214 | 10 8b6bad1512e1: r10 both |
|
223 | 10 8b6bad1512e1: r10 both | |
215 | 11 a19bfa7e7328: r11 both |
|
224 | 11 a19bfa7e7328: r11 both | |
216 | $ hg pull $remote |
|
225 | $ hg pull $remote | |
217 | pulling from http://localhost:$HGPORT/ |
|
226 | pulling from http://localhost:$HGPORT/ | |
218 | searching for changes |
|
227 | searching for changes | |
219 | no changes found |
|
228 | no changes found | |
220 | $ hg push $remote |
|
229 | $ hg push $remote | |
221 | pushing to http://localhost:$HGPORT/ |
|
230 | pushing to http://localhost:$HGPORT/ | |
222 | searching for changes |
|
231 | searching for changes | |
223 | remote: adding changesets |
|
232 | remote: adding changesets | |
224 | remote: adding manifests |
|
233 | remote: adding manifests | |
225 | remote: adding file changes |
|
234 | remote: adding file changes | |
226 | remote: added 12 changesets with 24 changes to 2 files |
|
235 | remote: added 12 changesets with 24 changes to 2 files | |
227 | $ hg outgoing $remote |
|
236 | $ hg outgoing $remote | |
228 | comparing with http://localhost:$HGPORT/ |
|
237 | comparing with http://localhost:$HGPORT/ | |
229 | searching for changes |
|
238 | searching for changes | |
230 | no changes found |
|
239 | no changes found | |
231 | [1] |
|
240 | [1] | |
232 | $ cd .. |
|
241 | $ cd .. | |
233 |
|
242 | |||
234 | Local is superset: |
|
243 | Local is superset: | |
235 |
|
244 | |||
236 | $ tstop |
|
245 | $ tstop | |
237 | $ hg clone main subset2 --rev name2 |
|
246 | $ hg clone main subset2 --rev name2 | |
238 | adding changesets |
|
247 | adding changesets | |
239 | adding manifests |
|
248 | adding manifests | |
240 | adding file changes |
|
249 | adding file changes | |
241 | added 6 changesets with 12 changes to 2 files |
|
250 | added 6 changesets with 12 changes to 2 files | |
242 | updating to branch name2 |
|
251 | updating to branch name2 | |
243 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
252 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
244 | $ tstart subset2 |
|
253 | $ tstart subset2 | |
245 | $ cd main |
|
254 | $ cd main | |
246 | $ hg incoming $remote |
|
255 | $ hg incoming $remote | |
247 | comparing with http://localhost:$HGPORT/ |
|
256 | comparing with http://localhost:$HGPORT/ | |
248 | searching for changes |
|
257 | searching for changes | |
249 | no changes found |
|
258 | no changes found | |
250 | [1] |
|
259 | [1] | |
251 | $ hg outgoing $remote |
|
260 | $ hg outgoing $remote | |
252 | comparing with http://localhost:$HGPORT/ |
|
261 | comparing with http://localhost:$HGPORT/ | |
253 | searching for changes |
|
262 | searching for changes | |
254 | 2 a7892891da29: r2 name1 |
|
263 | 2 a7892891da29: r2 name1 | |
255 | 3 2c8d5d5ec612: r3 name1 |
|
264 | 3 2c8d5d5ec612: r3 name1 | |
256 | 4 e71dbbc70e03: r4 name1 |
|
265 | 4 e71dbbc70e03: r4 name1 | |
257 | 9 025829e08038: r9 both |
|
266 | 9 025829e08038: r9 both | |
258 | 10 8b6bad1512e1: r10 both |
|
267 | 10 8b6bad1512e1: r10 both | |
259 | 11 a19bfa7e7328: r11 both |
|
268 | 11 a19bfa7e7328: r11 both | |
260 | $ hg pull $remote |
|
269 | $ hg pull $remote | |
261 | pulling from http://localhost:$HGPORT/ |
|
270 | pulling from http://localhost:$HGPORT/ | |
262 | searching for changes |
|
271 | searching for changes | |
263 | no changes found |
|
272 | no changes found | |
264 | $ hg push $remote |
|
273 | $ hg push $remote | |
265 | pushing to http://localhost:$HGPORT/ |
|
274 | pushing to http://localhost:$HGPORT/ | |
266 | searching for changes |
|
275 | searching for changes | |
267 | abort: push creates new remote branches: both, name1! |
|
276 | abort: push creates new remote branches: both, name1! | |
268 | (use 'hg push --new-branch' to create new remote branches) |
|
277 | (use 'hg push --new-branch' to create new remote branches) | |
269 | [255] |
|
278 | [255] | |
270 | $ hg push $remote --new-branch |
|
279 | $ hg push $remote --new-branch | |
271 | pushing to http://localhost:$HGPORT/ |
|
280 | pushing to http://localhost:$HGPORT/ | |
272 | searching for changes |
|
281 | searching for changes | |
273 | remote: adding changesets |
|
282 | remote: adding changesets | |
274 | remote: adding manifests |
|
283 | remote: adding manifests | |
275 | remote: adding file changes |
|
284 | remote: adding file changes | |
276 | remote: added 6 changesets with 12 changes to 2 files |
|
285 | remote: added 6 changesets with 12 changes to 2 files | |
277 | $ hg outgoing $remote |
|
286 | $ hg outgoing $remote | |
278 | comparing with http://localhost:$HGPORT/ |
|
287 | comparing with http://localhost:$HGPORT/ | |
279 | searching for changes |
|
288 | searching for changes | |
280 | no changes found |
|
289 | no changes found | |
281 | [1] |
|
290 | [1] | |
282 | $ cd .. |
|
291 | $ cd .. | |
283 |
|
292 | |||
284 | Partial pull: |
|
293 | Partial pull: | |
285 |
|
294 | |||
286 | $ tstop ; tstart main |
|
295 | $ tstop ; tstart main | |
287 | $ hg clone $remote partial --rev name2 |
|
296 | $ hg clone $remote partial --rev name2 | |
288 | adding changesets |
|
297 | adding changesets | |
289 | adding manifests |
|
298 | adding manifests | |
290 | adding file changes |
|
299 | adding file changes | |
291 | added 6 changesets with 12 changes to 2 files |
|
300 | added 6 changesets with 12 changes to 2 files | |
292 | updating to branch name2 |
|
301 | updating to branch name2 | |
293 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
302 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
294 | $ cd partial |
|
303 | $ cd partial | |
295 | $ hg incoming $remote |
|
304 | $ hg incoming $remote | |
296 | comparing with http://localhost:$HGPORT/ |
|
305 | comparing with http://localhost:$HGPORT/ | |
297 | searching for changes |
|
306 | searching for changes | |
298 | 6 a7892891da29: r2 name1 |
|
307 | 6 a7892891da29: r2 name1 | |
299 | 7 2c8d5d5ec612: r3 name1 |
|
308 | 7 2c8d5d5ec612: r3 name1 | |
300 | 8 e71dbbc70e03: r4 name1 |
|
309 | 8 e71dbbc70e03: r4 name1 | |
301 | 9 025829e08038: r9 both |
|
310 | 9 025829e08038: r9 both | |
302 | 10 8b6bad1512e1: r10 both |
|
311 | 10 8b6bad1512e1: r10 both | |
303 | 11 a19bfa7e7328: r11 both |
|
312 | 11 a19bfa7e7328: r11 both | |
304 | $ hg incoming $remote --rev name1 |
|
313 | $ hg incoming $remote --rev name1 | |
305 | comparing with http://localhost:$HGPORT/ |
|
314 | comparing with http://localhost:$HGPORT/ | |
306 | searching for changes |
|
315 | searching for changes | |
307 | 6 a7892891da29: r2 name1 |
|
316 | 6 a7892891da29: r2 name1 | |
308 | 7 2c8d5d5ec612: r3 name1 |
|
317 | 7 2c8d5d5ec612: r3 name1 | |
309 | 8 e71dbbc70e03: r4 name1 |
|
318 | 8 e71dbbc70e03: r4 name1 | |
310 | $ hg pull $remote --rev name1 |
|
319 | $ hg pull $remote --rev name1 | |
311 | pulling from http://localhost:$HGPORT/ |
|
320 | pulling from http://localhost:$HGPORT/ | |
312 | searching for changes |
|
321 | searching for changes | |
313 | adding changesets |
|
322 | adding changesets | |
314 | adding manifests |
|
323 | adding manifests | |
315 | adding file changes |
|
324 | adding file changes | |
316 | added 3 changesets with 6 changes to 2 files (+1 heads) |
|
325 | added 3 changesets with 6 changes to 2 files (+1 heads) | |
317 | (run 'hg heads' to see heads) |
|
326 | (run 'hg heads' to see heads) | |
318 | $ hg incoming $remote |
|
327 | $ hg incoming $remote | |
319 | comparing with http://localhost:$HGPORT/ |
|
328 | comparing with http://localhost:$HGPORT/ | |
320 | searching for changes |
|
329 | searching for changes | |
321 | 9 025829e08038: r9 both |
|
330 | 9 025829e08038: r9 both | |
322 | 10 8b6bad1512e1: r10 both |
|
331 | 10 8b6bad1512e1: r10 both | |
323 | 11 a19bfa7e7328: r11 both |
|
332 | 11 a19bfa7e7328: r11 both | |
324 | $ cd .. |
|
333 | $ cd .. | |
325 |
|
334 | |||
326 | Both have new stuff in new named branches: |
|
335 | Both have new stuff in new named branches: | |
327 |
|
336 | |||
328 | $ tstop |
|
337 | $ tstop | |
329 | $ hg clone main repo1a --rev name1 -q |
|
338 | $ hg clone main repo1a --rev name1 -q | |
330 | $ hg clone repo1a repo1b -q |
|
339 | $ hg clone repo1a repo1b -q | |
331 | $ hg clone main repo2a --rev name2 -q |
|
340 | $ hg clone main repo2a --rev name2 -q | |
332 | $ hg clone repo2a repo2b -q |
|
341 | $ hg clone repo2a repo2b -q | |
333 | $ tstart repo1a |
|
342 | $ tstart repo1a | |
334 |
|
343 | |||
335 | $ cd repo2a |
|
344 | $ cd repo2a | |
336 | $ hg incoming $remote |
|
345 | $ hg incoming $remote | |
337 | comparing with http://localhost:$HGPORT/ |
|
346 | comparing with http://localhost:$HGPORT/ | |
338 | searching for changes |
|
347 | searching for changes | |
339 | 6 a7892891da29: r2 name1 |
|
348 | 6 a7892891da29: r2 name1 | |
340 | 7 2c8d5d5ec612: r3 name1 |
|
349 | 7 2c8d5d5ec612: r3 name1 | |
341 | 8 e71dbbc70e03: r4 name1 |
|
350 | 8 e71dbbc70e03: r4 name1 | |
342 | $ hg outgoing $remote |
|
351 | $ hg outgoing $remote | |
343 | comparing with http://localhost:$HGPORT/ |
|
352 | comparing with http://localhost:$HGPORT/ | |
344 | searching for changes |
|
353 | searching for changes | |
345 | 2 70314b29987d: r5 name2 |
|
354 | 2 70314b29987d: r5 name2 | |
346 | 3 6c6f5d5f3c11: r6 name2 |
|
355 | 3 6c6f5d5f3c11: r6 name2 | |
347 | 4 b6b4d315a2ac: r7 name2 |
|
356 | 4 b6b4d315a2ac: r7 name2 | |
348 | 5 d8f638ac69e9: r8 name2 |
|
357 | 5 d8f638ac69e9: r8 name2 | |
349 | $ hg push $remote --new-branch |
|
358 | $ hg push $remote --new-branch | |
350 | pushing to http://localhost:$HGPORT/ |
|
359 | pushing to http://localhost:$HGPORT/ | |
351 | searching for changes |
|
360 | searching for changes | |
352 | remote: adding changesets |
|
361 | remote: adding changesets | |
353 | remote: adding manifests |
|
362 | remote: adding manifests | |
354 | remote: adding file changes |
|
363 | remote: adding file changes | |
355 | remote: added 4 changesets with 8 changes to 2 files (+1 heads) |
|
364 | remote: added 4 changesets with 8 changes to 2 files (+1 heads) | |
356 | $ hg pull $remote |
|
365 | $ hg pull $remote | |
357 | pulling from http://localhost:$HGPORT/ |
|
366 | pulling from http://localhost:$HGPORT/ | |
358 | searching for changes |
|
367 | searching for changes | |
359 | adding changesets |
|
368 | adding changesets | |
360 | adding manifests |
|
369 | adding manifests | |
361 | adding file changes |
|
370 | adding file changes | |
362 | added 3 changesets with 6 changes to 2 files (+1 heads) |
|
371 | added 3 changesets with 6 changes to 2 files (+1 heads) | |
363 | (run 'hg heads' to see heads) |
|
372 | (run 'hg heads' to see heads) | |
364 | $ hg incoming $remote |
|
373 | $ hg incoming $remote | |
365 | comparing with http://localhost:$HGPORT/ |
|
374 | comparing with http://localhost:$HGPORT/ | |
366 | searching for changes |
|
375 | searching for changes | |
367 | no changes found |
|
376 | no changes found | |
368 | [1] |
|
377 | [1] | |
369 | $ hg outgoing $remote |
|
378 | $ hg outgoing $remote | |
370 | comparing with http://localhost:$HGPORT/ |
|
379 | comparing with http://localhost:$HGPORT/ | |
371 | searching for changes |
|
380 | searching for changes | |
372 | no changes found |
|
381 | no changes found | |
373 | [1] |
|
382 | [1] | |
374 | $ cd .. |
|
383 | $ cd .. | |
375 |
|
384 | |||
376 | $ tstop ; tstart repo1b |
|
385 | $ tstop ; tstart repo1b | |
377 | $ cd repo2b |
|
386 | $ cd repo2b | |
378 | $ hg incoming $remote |
|
387 | $ hg incoming $remote | |
379 | comparing with http://localhost:$HGPORT/ |
|
388 | comparing with http://localhost:$HGPORT/ | |
380 | searching for changes |
|
389 | searching for changes | |
381 | 6 a7892891da29: r2 name1 |
|
390 | 6 a7892891da29: r2 name1 | |
382 | 7 2c8d5d5ec612: r3 name1 |
|
391 | 7 2c8d5d5ec612: r3 name1 | |
383 | 8 e71dbbc70e03: r4 name1 |
|
392 | 8 e71dbbc70e03: r4 name1 | |
384 | $ hg outgoing $remote |
|
393 | $ hg outgoing $remote | |
385 | comparing with http://localhost:$HGPORT/ |
|
394 | comparing with http://localhost:$HGPORT/ | |
386 | searching for changes |
|
395 | searching for changes | |
387 | 2 70314b29987d: r5 name2 |
|
396 | 2 70314b29987d: r5 name2 | |
388 | 3 6c6f5d5f3c11: r6 name2 |
|
397 | 3 6c6f5d5f3c11: r6 name2 | |
389 | 4 b6b4d315a2ac: r7 name2 |
|
398 | 4 b6b4d315a2ac: r7 name2 | |
390 | 5 d8f638ac69e9: r8 name2 |
|
399 | 5 d8f638ac69e9: r8 name2 | |
391 | $ hg pull $remote |
|
400 | $ hg pull $remote | |
392 | pulling from http://localhost:$HGPORT/ |
|
401 | pulling from http://localhost:$HGPORT/ | |
393 | searching for changes |
|
402 | searching for changes | |
394 | adding changesets |
|
403 | adding changesets | |
395 | adding manifests |
|
404 | adding manifests | |
396 | adding file changes |
|
405 | adding file changes | |
397 | added 3 changesets with 6 changes to 2 files (+1 heads) |
|
406 | added 3 changesets with 6 changes to 2 files (+1 heads) | |
398 | (run 'hg heads' to see heads) |
|
407 | (run 'hg heads' to see heads) | |
399 | $ hg push $remote --new-branch |
|
408 | $ hg push $remote --new-branch | |
400 | pushing to http://localhost:$HGPORT/ |
|
409 | pushing to http://localhost:$HGPORT/ | |
401 | searching for changes |
|
410 | searching for changes | |
402 | remote: adding changesets |
|
411 | remote: adding changesets | |
403 | remote: adding manifests |
|
412 | remote: adding manifests | |
404 | remote: adding file changes |
|
413 | remote: adding file changes | |
405 | remote: added 4 changesets with 8 changes to 2 files (+1 heads) |
|
414 | remote: added 4 changesets with 8 changes to 2 files (+1 heads) | |
406 | $ hg incoming $remote |
|
415 | $ hg incoming $remote | |
407 | comparing with http://localhost:$HGPORT/ |
|
416 | comparing with http://localhost:$HGPORT/ | |
408 | searching for changes |
|
417 | searching for changes | |
409 | no changes found |
|
418 | no changes found | |
410 | [1] |
|
419 | [1] | |
411 | $ hg outgoing $remote |
|
420 | $ hg outgoing $remote | |
412 | comparing with http://localhost:$HGPORT/ |
|
421 | comparing with http://localhost:$HGPORT/ | |
413 | searching for changes |
|
422 | searching for changes | |
414 | no changes found |
|
423 | no changes found | |
415 | [1] |
|
424 | [1] | |
416 | $ cd .. |
|
425 | $ cd .. | |
417 |
|
426 | |||
418 | Both have new stuff in existing named branches: |
|
427 | Both have new stuff in existing named branches: | |
419 |
|
428 | |||
420 | $ tstop |
|
429 | $ tstop | |
421 | $ rm -r repo1a repo1b repo2a repo2b |
|
430 | $ rm -r repo1a repo1b repo2a repo2b | |
422 | $ hg clone main repo1a --rev 3 --rev 8 -q |
|
431 | $ hg clone main repo1a --rev 3 --rev 8 -q | |
423 | $ hg clone repo1a repo1b -q |
|
432 | $ hg clone repo1a repo1b -q | |
424 | $ hg clone main repo2a --rev 4 --rev 7 -q |
|
433 | $ hg clone main repo2a --rev 4 --rev 7 -q | |
425 | $ hg clone repo2a repo2b -q |
|
434 | $ hg clone repo2a repo2b -q | |
426 | $ tstart repo1a |
|
435 | $ tstart repo1a | |
427 |
|
436 | |||
428 | $ cd repo2a |
|
437 | $ cd repo2a | |
429 | $ hg incoming $remote |
|
438 | $ hg incoming $remote | |
430 | comparing with http://localhost:$HGPORT/ |
|
439 | comparing with http://localhost:$HGPORT/ | |
431 | searching for changes |
|
440 | searching for changes | |
432 | 8 d8f638ac69e9: r8 name2 |
|
441 | 8 d8f638ac69e9: r8 name2 | |
433 | $ hg outgoing $remote |
|
442 | $ hg outgoing $remote | |
434 | comparing with http://localhost:$HGPORT/ |
|
443 | comparing with http://localhost:$HGPORT/ | |
435 | searching for changes |
|
444 | searching for changes | |
436 | 4 e71dbbc70e03: r4 name1 |
|
445 | 4 e71dbbc70e03: r4 name1 | |
437 | $ hg push $remote --new-branch |
|
446 | $ hg push $remote --new-branch | |
438 | pushing to http://localhost:$HGPORT/ |
|
447 | pushing to http://localhost:$HGPORT/ | |
439 | searching for changes |
|
448 | searching for changes | |
440 | remote: adding changesets |
|
449 | remote: adding changesets | |
441 | remote: adding manifests |
|
450 | remote: adding manifests | |
442 | remote: adding file changes |
|
451 | remote: adding file changes | |
443 | remote: added 1 changesets with 2 changes to 2 files |
|
452 | remote: added 1 changesets with 2 changes to 2 files | |
444 | $ hg pull $remote |
|
453 | $ hg pull $remote | |
445 | pulling from http://localhost:$HGPORT/ |
|
454 | pulling from http://localhost:$HGPORT/ | |
446 | searching for changes |
|
455 | searching for changes | |
447 | adding changesets |
|
456 | adding changesets | |
448 | adding manifests |
|
457 | adding manifests | |
449 | adding file changes |
|
458 | adding file changes | |
450 | added 1 changesets with 2 changes to 2 files |
|
459 | added 1 changesets with 2 changes to 2 files | |
451 | (run 'hg update' to get a working copy) |
|
460 | (run 'hg update' to get a working copy) | |
452 | $ hg incoming $remote |
|
461 | $ hg incoming $remote | |
453 | comparing with http://localhost:$HGPORT/ |
|
462 | comparing with http://localhost:$HGPORT/ | |
454 | searching for changes |
|
463 | searching for changes | |
455 | no changes found |
|
464 | no changes found | |
456 | [1] |
|
465 | [1] | |
457 | $ hg outgoing $remote |
|
466 | $ hg outgoing $remote | |
458 | comparing with http://localhost:$HGPORT/ |
|
467 | comparing with http://localhost:$HGPORT/ | |
459 | searching for changes |
|
468 | searching for changes | |
460 | no changes found |
|
469 | no changes found | |
461 | [1] |
|
470 | [1] | |
462 | $ cd .. |
|
471 | $ cd .. | |
463 |
|
472 | |||
464 | $ tstop ; tstart repo1b |
|
473 | $ tstop ; tstart repo1b | |
465 | $ cd repo2b |
|
474 | $ cd repo2b | |
466 | $ hg incoming $remote |
|
475 | $ hg incoming $remote | |
467 | comparing with http://localhost:$HGPORT/ |
|
476 | comparing with http://localhost:$HGPORT/ | |
468 | searching for changes |
|
477 | searching for changes | |
469 | 8 d8f638ac69e9: r8 name2 |
|
478 | 8 d8f638ac69e9: r8 name2 | |
470 | $ hg outgoing $remote |
|
479 | $ hg outgoing $remote | |
471 | comparing with http://localhost:$HGPORT/ |
|
480 | comparing with http://localhost:$HGPORT/ | |
472 | searching for changes |
|
481 | searching for changes | |
473 | 4 e71dbbc70e03: r4 name1 |
|
482 | 4 e71dbbc70e03: r4 name1 | |
474 | $ hg pull $remote |
|
483 | $ hg pull $remote | |
475 | pulling from http://localhost:$HGPORT/ |
|
484 | pulling from http://localhost:$HGPORT/ | |
476 | searching for changes |
|
485 | searching for changes | |
477 | adding changesets |
|
486 | adding changesets | |
478 | adding manifests |
|
487 | adding manifests | |
479 | adding file changes |
|
488 | adding file changes | |
480 | added 1 changesets with 2 changes to 2 files |
|
489 | added 1 changesets with 2 changes to 2 files | |
481 | (run 'hg update' to get a working copy) |
|
490 | (run 'hg update' to get a working copy) | |
482 | $ hg push $remote --new-branch |
|
491 | $ hg push $remote --new-branch | |
483 | pushing to http://localhost:$HGPORT/ |
|
492 | pushing to http://localhost:$HGPORT/ | |
484 | searching for changes |
|
493 | searching for changes | |
485 | remote: adding changesets |
|
494 | remote: adding changesets | |
486 | remote: adding manifests |
|
495 | remote: adding manifests | |
487 | remote: adding file changes |
|
496 | remote: adding file changes | |
488 | remote: added 1 changesets with 2 changes to 2 files |
|
497 | remote: added 1 changesets with 2 changes to 2 files | |
489 | $ hg incoming $remote |
|
498 | $ hg incoming $remote | |
490 | comparing with http://localhost:$HGPORT/ |
|
499 | comparing with http://localhost:$HGPORT/ | |
491 | searching for changes |
|
500 | searching for changes | |
492 | no changes found |
|
501 | no changes found | |
493 | [1] |
|
502 | [1] | |
494 | $ hg outgoing $remote |
|
503 | $ hg outgoing $remote | |
495 | comparing with http://localhost:$HGPORT/ |
|
504 | comparing with http://localhost:$HGPORT/ | |
496 | searching for changes |
|
505 | searching for changes | |
497 | no changes found |
|
506 | no changes found | |
498 | [1] |
|
507 | [1] | |
499 | $ cd .. |
|
508 | $ cd .. | |
500 |
|
509 | |||
501 | $ tstop |
|
510 | $ tstop | |
502 |
|
511 |
General Comments 0
You need to be logged in to leave comments.
Login now