view tests/test-bookmarks-rebase @ 7460:3342e6ada4b9

push: use the fast changegroup() path on push The race doesn't happen on push (because the discovery is done in the same hg process), so use the fast path instead.
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 02 Dec 2008 19:36:43 +0100
parents 98408cb74137
children 6c82beaaa11a
line wrap: on
line source

#!/bin/sh

echo "[extensions]" >> $HGRCPATH
echo "rebase=" >> $HGRCPATH
echo "bookmarks=" >> $HGRCPATH

cleanoutput () {
    sed -e 's/\(Rebase status stored to\).*/\1/'  \
        -e 's/\(Rebase status restored from\).*/\1/' \
        -e 's/\(saving bundle to \).*/\1/'
}

echo % initialize repository
hg init

echo 'a' > a
hg ci -A -d '0 0' -u test -m "0"

echo 'b' > b
hg ci -A -d '0 0' -u test -m "1"

hg up 0
echo 'c' > c
hg ci -A -d '0 0' -u test -m "2"

echo 'd' > d
hg ci -A -d '0 0' -u test -m "3"

hg bookmark -r 1 one
hg bookmark -r 3 two

echo % bookmark list
hg bookmark

echo % rebase
hg rebase -s two -d one 2>&1 | cleanoutput

hg log