equal
deleted
inserted
replaced
304 (run 'hg update' to get a working copy) |
304 (run 'hg update' to get a working copy) |
305 $ hg book |
305 $ hg book |
306 * @ 1:0d2164f0ce0d |
306 * @ 1:0d2164f0ce0d |
307 X 1:0d2164f0ce0d |
307 X 1:0d2164f0ce0d |
308 Y 4:b0a5eff05604 |
308 Y 4:b0a5eff05604 |
|
309 Z 1:0d2164f0ce0d |
|
310 |
|
311 Update a bookmark right after the initial lookup -B (issue4689) |
|
312 |
|
313 $ echo c6 > ../pull-race/f3 # to be committed during the race |
|
314 $ cat <<EOF > ../pull-race/.hg/hgrc |
|
315 > [hooks] |
|
316 > # If anything to commit, commit it right after the first key listing used |
|
317 > # during lookup. This makes the commit appear before the actual getbundle |
|
318 > # call. |
|
319 > listkeys.makecommit= ((hg st | grep -q M) && (hg commit -m race; echo commited in pull-race)) || exit 0 |
|
320 > EOF |
|
321 |
|
322 (new config need server restart) |
|
323 |
|
324 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS |
|
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 |
|
327 |
|
328 $ hg -R $TESTTMP/pull-race book |
|
329 @ 1:0d2164f0ce0d |
|
330 X 1:0d2164f0ce0d |
|
331 * Y 5:35d1ef0a8d1b |
|
332 Z 1:0d2164f0ce0d |
|
333 $ hg pull -B Y |
|
334 pulling from http://localhost:$HGPORT/ |
|
335 searching for changes |
|
336 adding changesets |
|
337 adding manifests |
|
338 adding file changes |
|
339 added 1 changesets with 1 changes to 1 files |
|
340 updating bookmark Y |
|
341 (run 'hg update' to get a working copy) |
|
342 $ hg book |
|
343 * @ 1:0d2164f0ce0d |
|
344 X 1:0d2164f0ce0d |
|
345 Y 5:35d1ef0a8d1b |
309 Z 1:0d2164f0ce0d |
346 Z 1:0d2164f0ce0d |
310 |
347 |
311 (done with this section of the test) |
348 (done with this section of the test) |
312 |
349 |
313 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS |
350 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS |