equal
deleted
inserted
replaced
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 $ start() { |
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 $ stop() { |
23 $ tstop() { |
24 > "$TESTDIR/killdaemons.py" |
24 > "$TESTDIR/killdaemons.py" |
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 $ start empty2 |
31 $ tstart empty2 |
32 $ hg incoming -R empty1 $remote |
32 $ hg incoming -R empty1 $remote |
33 comparing with http://localhost:$HGPORT/ |
33 comparing with http://localhost:$HGPORT/ |
34 no changes found |
34 no changes found |
35 [1] |
35 [1] |
36 $ hg outgoing -R empty1 $remote |
36 $ hg outgoing -R empty1 $remote |
41 pulling from http://localhost:$HGPORT/ |
41 pulling from http://localhost:$HGPORT/ |
42 no changes found |
42 no changes found |
43 $ hg push -R empty1 $remote |
43 $ hg push -R empty1 $remote |
44 pushing to http://localhost:$HGPORT/ |
44 pushing to http://localhost:$HGPORT/ |
45 no changes found |
45 no changes found |
46 $ stop |
46 $ tstop |
47 |
47 |
48 Base repo: |
48 Base repo: |
49 |
49 |
50 $ hg init main |
50 $ hg init main |
51 $ cd main |
51 $ cd main |
74 o 1 0019a3b924fd: r1 |
74 o 1 0019a3b924fd: r1 |
75 | |
75 | |
76 o 0 d57206cc072a: r0 |
76 o 0 d57206cc072a: r0 |
77 |
77 |
78 $ cd .. |
78 $ cd .. |
79 $ start main |
79 $ tstart main |
80 |
80 |
81 Full clone: |
81 Full clone: |
82 |
82 |
83 $ hg clone main full |
83 $ hg clone main full |
84 updating to branch default |
84 updating to branch default |
185 [1] |
185 [1] |
186 $ cd .. |
186 $ cd .. |
187 |
187 |
188 Remote is empty: |
188 Remote is empty: |
189 |
189 |
190 $ stop ; start empty2 |
190 $ tstop ; tstart empty2 |
191 $ cd main |
191 $ cd main |
192 $ hg incoming $remote |
192 $ hg incoming $remote |
193 comparing with http://localhost:$HGPORT/ |
193 comparing with http://localhost:$HGPORT/ |
194 searching for changes |
194 searching for changes |
195 no changes found |
195 no changes found |
227 [1] |
227 [1] |
228 $ cd .. |
228 $ cd .. |
229 |
229 |
230 Local is superset: |
230 Local is superset: |
231 |
231 |
232 $ stop |
232 $ tstop |
233 $ hg clone main subset2 --rev name2 |
233 $ hg clone main subset2 --rev name2 |
234 adding changesets |
234 adding changesets |
235 adding manifests |
235 adding manifests |
236 adding file changes |
236 adding file changes |
237 added 6 changesets with 12 changes to 2 files |
237 added 6 changesets with 12 changes to 2 files |
238 updating to branch name2 |
238 updating to branch name2 |
239 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
239 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
240 $ start subset2 |
240 $ tstart subset2 |
241 $ cd main |
241 $ cd main |
242 $ hg incoming $remote |
242 $ hg incoming $remote |
243 comparing with http://localhost:$HGPORT/ |
243 comparing with http://localhost:$HGPORT/ |
244 searching for changes |
244 searching for changes |
245 no changes found |
245 no changes found |
277 [1] |
277 [1] |
278 $ cd .. |
278 $ cd .. |
279 |
279 |
280 Partial pull: |
280 Partial pull: |
281 |
281 |
282 $ stop ; start main |
282 $ tstop ; tstart main |
283 $ hg clone $remote partial --rev name2 |
283 $ hg clone $remote partial --rev name2 |
284 adding changesets |
284 adding changesets |
285 adding manifests |
285 adding manifests |
286 adding file changes |
286 adding file changes |
287 added 6 changesets with 12 changes to 2 files |
287 added 6 changesets with 12 changes to 2 files |
319 11 a19bfa7e7328: r11 both |
319 11 a19bfa7e7328: r11 both |
320 $ cd .. |
320 $ cd .. |
321 |
321 |
322 Both have new stuff in new named branches: |
322 Both have new stuff in new named branches: |
323 |
323 |
324 $ stop |
324 $ tstop |
325 $ hg clone main repo1a --rev name1 -q |
325 $ hg clone main repo1a --rev name1 -q |
326 $ hg clone repo1a repo1b -q |
326 $ hg clone repo1a repo1b -q |
327 $ hg clone main repo2a --rev name2 -q |
327 $ hg clone main repo2a --rev name2 -q |
328 $ hg clone repo2a repo2b -q |
328 $ hg clone repo2a repo2b -q |
329 $ start repo1a |
329 $ tstart repo1a |
330 |
330 |
331 $ cd repo2a |
331 $ cd repo2a |
332 $ hg incoming $remote |
332 $ hg incoming $remote |
333 comparing with http://localhost:$HGPORT/ |
333 comparing with http://localhost:$HGPORT/ |
334 searching for changes |
334 searching for changes |
367 searching for changes |
367 searching for changes |
368 no changes found |
368 no changes found |
369 [1] |
369 [1] |
370 $ cd .. |
370 $ cd .. |
371 |
371 |
372 $ stop ; start repo1b |
372 $ tstop ; tstart repo1b |
373 $ cd repo2b |
373 $ cd repo2b |
374 $ hg incoming $remote |
374 $ hg incoming $remote |
375 comparing with http://localhost:$HGPORT/ |
375 comparing with http://localhost:$HGPORT/ |
376 searching for changes |
376 searching for changes |
377 6 a7892891da29: r2 name1 |
377 6 a7892891da29: r2 name1 |
411 [1] |
411 [1] |
412 $ cd .. |
412 $ cd .. |
413 |
413 |
414 Both have new stuff in existing named branches: |
414 Both have new stuff in existing named branches: |
415 |
415 |
416 $ stop |
416 $ tstop |
417 $ rm -r repo1a repo1b repo2a repo2b |
417 $ rm -r repo1a repo1b repo2a repo2b |
418 $ hg clone main repo1a --rev 3 --rev 8 -q |
418 $ hg clone main repo1a --rev 3 --rev 8 -q |
419 $ hg clone repo1a repo1b -q |
419 $ hg clone repo1a repo1b -q |
420 $ hg clone main repo2a --rev 4 --rev 7 -q |
420 $ hg clone main repo2a --rev 4 --rev 7 -q |
421 $ hg clone repo2a repo2b -q |
421 $ hg clone repo2a repo2b -q |
422 $ start repo1a |
422 $ tstart repo1a |
423 |
423 |
424 $ cd repo2a |
424 $ cd repo2a |
425 $ hg incoming $remote |
425 $ hg incoming $remote |
426 comparing with http://localhost:$HGPORT/ |
426 comparing with http://localhost:$HGPORT/ |
427 searching for changes |
427 searching for changes |
455 searching for changes |
455 searching for changes |
456 no changes found |
456 no changes found |
457 [1] |
457 [1] |
458 $ cd .. |
458 $ cd .. |
459 |
459 |
460 $ stop ; start repo1b |
460 $ tstop ; tstart repo1b |
461 $ cd repo2b |
461 $ cd repo2b |
462 $ hg incoming $remote |
462 $ hg incoming $remote |
463 comparing with http://localhost:$HGPORT/ |
463 comparing with http://localhost:$HGPORT/ |
464 searching for changes |
464 searching for changes |
465 8 d8f638ac69e9: r8 name2 |
465 8 d8f638ac69e9: r8 name2 |
492 searching for changes |
492 searching for changes |
493 no changes found |
493 no changes found |
494 [1] |
494 [1] |
495 $ cd .. |
495 $ cd .. |
496 |
496 |
497 $ stop |
497 $ tstop |
498 |
498 |