tests/test-bookmarks-pushpull.t

25470:378a8e700e02

  > EOF

(new config needs a server restart)

  $ cd ..
  $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
  $ hg -R pull-race serve -p $HGPORT -d --pid-file=pull-race.pid -E main-error.log
  $ cat pull-race.pid >> $DAEMON_PIDS
  $ cd pull-race2
  $ hg -R $TESTTMP/pull-race book
     @                         1:0d2164f0ce0d

  > listkeys.makecommit= ((hg st | grep -q M) && (hg commit -m race; echo commited in pull-race)) || exit 0
  > EOF

(new config need server restart)

  $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
  $ hg -R ../pull-race serve -p $HGPORT -d --pid-file=../pull-race.pid -E main-error.log
  $ cat ../pull-race.pid >> $DAEMON_PIDS

  $ hg -R $TESTTMP/pull-race book
     @                         1:0d2164f0ce0d

     Y                         5:35d1ef0a8d1b
     Z                         1:0d2164f0ce0d

(done with this section of the test)

  $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
  $ cd ../b

diverging a remote bookmark fails

  $ hg up -q 4e3505fd9583

  > prepushkey=false
  > [web]
  > push_ssl = false
  > allow_push = *
  > EOF
  $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
  $ hg -R ../issue4455-dest serve -p $HGPORT -d --pid-file=../issue4455.pid -E ../issue4455-error.log
  $ cat ../issue4455.pid >> $DAEMON_PIDS

Local push
----------

25472:4d2b9b304ad0

  > EOF

(new config needs a server restart)

  $ cd ..
  $ killdaemons.py $DAEMON_PIDS
  $ hg -R pull-race serve -p $HGPORT -d --pid-file=pull-race.pid -E main-error.log
  $ cat pull-race.pid >> $DAEMON_PIDS
  $ cd pull-race2
  $ hg -R $TESTTMP/pull-race book
     @                         1:0d2164f0ce0d

  > listkeys.makecommit= ((hg st | grep -q M) && (hg commit -m race; echo commited in pull-race)) || exit 0
  > EOF

(new config need server restart)

  $ killdaemons.py $DAEMON_PIDS
  $ hg -R ../pull-race serve -p $HGPORT -d --pid-file=../pull-race.pid -E main-error.log
  $ cat ../pull-race.pid >> $DAEMON_PIDS

  $ hg -R $TESTTMP/pull-race book
     @                         1:0d2164f0ce0d

     Y                         5:35d1ef0a8d1b
     Z                         1:0d2164f0ce0d

(done with this section of the test)

  $ killdaemons.py $DAEMON_PIDS
  $ cd ../b

diverging a remote bookmark fails

  $ hg up -q 4e3505fd9583

  > prepushkey=false
  > [web]
  > push_ssl = false
  > allow_push = *
  > EOF
  $ killdaemons.py $DAEMON_PIDS
  $ hg -R ../issue4455-dest serve -p $HGPORT -d --pid-file=../issue4455.pid -E ../issue4455-error.log
  $ cat ../issue4455.pid >> $DAEMON_PIDS

Local push
----------