equal
deleted
inserted
replaced
288 $ hg clone -q a pull-race |
288 $ hg clone -q a pull-race |
289 |
289 |
290 We want to use http because it is stateless and therefore more susceptible to |
290 We want to use http because it is stateless and therefore more susceptible to |
291 race conditions |
291 race conditions |
292 |
292 |
293 $ hg -R pull-race serve -p $HGPORT -d --pid-file=pull-race.pid -E main-error.log |
293 $ hg serve -R pull-race -p $HGPORT -d --pid-file=pull-race.pid -E main-error.log |
294 $ cat pull-race.pid >> $DAEMON_PIDS |
294 $ cat pull-race.pid >> $DAEMON_PIDS |
295 |
295 |
296 $ hg clone -q http://localhost:$HGPORT/ pull-race2 |
296 $ hg clone -q http://localhost:$HGPORT/ pull-race2 |
297 $ cd pull-race |
297 $ cd pull-race |
298 $ hg up -q Y |
298 $ hg up -q Y |
306 |
306 |
307 (new config needs a server restart) |
307 (new config needs a server restart) |
308 |
308 |
309 $ cd .. |
309 $ cd .. |
310 $ killdaemons.py |
310 $ killdaemons.py |
311 $ hg -R pull-race serve -p $HGPORT -d --pid-file=pull-race.pid -E main-error.log |
311 $ hg serve -R pull-race -p $HGPORT -d --pid-file=pull-race.pid -E main-error.log |
312 $ cat pull-race.pid >> $DAEMON_PIDS |
312 $ cat pull-race.pid >> $DAEMON_PIDS |
313 $ cd pull-race2 |
313 $ cd pull-race2 |
314 $ hg -R $TESTTMP/pull-race book |
314 $ hg -R $TESTTMP/pull-race book |
315 @ 1:0d2164f0ce0d |
315 @ 1:0d2164f0ce0d |
316 X 1:0d2164f0ce0d |
316 X 1:0d2164f0ce0d |
343 > EOF |
343 > EOF |
344 |
344 |
345 (new config need server restart) |
345 (new config need server restart) |
346 |
346 |
347 $ killdaemons.py |
347 $ killdaemons.py |
348 $ hg -R ../pull-race serve -p $HGPORT -d --pid-file=../pull-race.pid -E main-error.log |
348 $ hg serve -R ../pull-race -p $HGPORT -d --pid-file=../pull-race.pid -E main-error.log |
349 $ cat ../pull-race.pid >> $DAEMON_PIDS |
349 $ cat ../pull-race.pid >> $DAEMON_PIDS |
350 |
350 |
351 $ hg -R $TESTTMP/pull-race book |
351 $ hg -R $TESTTMP/pull-race book |
352 @ 1:0d2164f0ce0d |
352 @ 1:0d2164f0ce0d |
353 X 1:0d2164f0ce0d |
353 X 1:0d2164f0ce0d |
402 > [web] |
402 > [web] |
403 > push_ssl = false |
403 > push_ssl = false |
404 > allow_push = * |
404 > allow_push = * |
405 > EOF |
405 > EOF |
406 |
406 |
407 $ hg -R ../a serve -p $HGPORT2 -d --pid-file=../hg2.pid |
407 $ hg serve -R ../a -p $HGPORT2 -d --pid-file=../hg2.pid |
408 $ cat ../hg2.pid >> $DAEMON_PIDS |
408 $ cat ../hg2.pid >> $DAEMON_PIDS |
409 |
409 |
410 $ hg push http://localhost:$HGPORT2/ |
410 $ hg push http://localhost:$HGPORT2/ |
411 pushing to http://localhost:$HGPORT2/ |
411 pushing to http://localhost:$HGPORT2/ |
412 searching for changes |
412 searching for changes |
785 > [web] |
785 > [web] |
786 > push_ssl = false |
786 > push_ssl = false |
787 > allow_push = * |
787 > allow_push = * |
788 > EOF |
788 > EOF |
789 $ killdaemons.py |
789 $ killdaemons.py |
790 $ hg -R ../issue4455-dest serve -p $HGPORT -d --pid-file=../issue4455.pid -E ../issue4455-error.log |
790 $ hg serve -R ../issue4455-dest -p $HGPORT -d --pid-file=../issue4455.pid -E ../issue4455-error.log |
791 $ cat ../issue4455.pid >> $DAEMON_PIDS |
791 $ cat ../issue4455.pid >> $DAEMON_PIDS |
792 |
792 |
793 Local push |
793 Local push |
794 ---------- |
794 ---------- |
795 |
795 |