equal
deleted
inserted
replaced
282 > EOF |
282 > EOF |
283 |
283 |
284 (new config needs a server restart) |
284 (new config needs a server restart) |
285 |
285 |
286 $ cd .. |
286 $ cd .. |
287 $ killdaemons.py $DAEMON_PIDS |
287 $ killdaemons.py |
288 $ hg -R pull-race serve -p $HGPORT -d --pid-file=pull-race.pid -E main-error.log |
288 $ hg -R pull-race serve -p $HGPORT -d --pid-file=pull-race.pid -E main-error.log |
289 $ cat pull-race.pid >> $DAEMON_PIDS |
289 $ cat pull-race.pid >> $DAEMON_PIDS |
290 $ cd pull-race2 |
290 $ cd pull-race2 |
291 $ hg -R $TESTTMP/pull-race book |
291 $ hg -R $TESTTMP/pull-race book |
292 @ 1:0d2164f0ce0d |
292 @ 1:0d2164f0ce0d |
319 > listkeys.makecommit= ((hg st | grep -q M) && (hg commit -m race; echo commited in pull-race)) || exit 0 |
319 > listkeys.makecommit= ((hg st | grep -q M) && (hg commit -m race; echo commited in pull-race)) || exit 0 |
320 > EOF |
320 > EOF |
321 |
321 |
322 (new config need server restart) |
322 (new config need server restart) |
323 |
323 |
324 $ killdaemons.py $DAEMON_PIDS |
324 $ killdaemons.py |
325 $ hg -R ../pull-race serve -p $HGPORT -d --pid-file=../pull-race.pid -E main-error.log |
325 $ hg -R ../pull-race serve -p $HGPORT -d --pid-file=../pull-race.pid -E main-error.log |
326 $ cat ../pull-race.pid >> $DAEMON_PIDS |
326 $ cat ../pull-race.pid >> $DAEMON_PIDS |
327 |
327 |
328 $ hg -R $TESTTMP/pull-race book |
328 $ hg -R $TESTTMP/pull-race book |
329 @ 1:0d2164f0ce0d |
329 @ 1:0d2164f0ce0d |
345 Y 5:35d1ef0a8d1b |
345 Y 5:35d1ef0a8d1b |
346 Z 1:0d2164f0ce0d |
346 Z 1:0d2164f0ce0d |
347 |
347 |
348 (done with this section of the test) |
348 (done with this section of the test) |
349 |
349 |
350 $ killdaemons.py $DAEMON_PIDS |
350 $ killdaemons.py |
351 $ cd ../b |
351 $ cd ../b |
352 |
352 |
353 diverging a remote bookmark fails |
353 diverging a remote bookmark fails |
354 |
354 |
355 $ hg up -q 4e3505fd9583 |
355 $ hg up -q 4e3505fd9583 |
741 > prepushkey=false |
741 > prepushkey=false |
742 > [web] |
742 > [web] |
743 > push_ssl = false |
743 > push_ssl = false |
744 > allow_push = * |
744 > allow_push = * |
745 > EOF |
745 > EOF |
746 $ killdaemons.py $DAEMON_PIDS |
746 $ killdaemons.py |
747 $ hg -R ../issue4455-dest serve -p $HGPORT -d --pid-file=../issue4455.pid -E ../issue4455-error.log |
747 $ hg -R ../issue4455-dest serve -p $HGPORT -d --pid-file=../issue4455.pid -E ../issue4455-error.log |
748 $ cat ../issue4455.pid >> $DAEMON_PIDS |
748 $ cat ../issue4455.pid >> $DAEMON_PIDS |
749 |
749 |
750 Local push |
750 Local push |
751 ---------- |
751 ---------- |