push: update to branch tip instead of tip We previously updated to the repository tip after pushing a revision, presumably on the assumption that tip would be the last revision we just pushed. This assumption is flawed for high traffic repositories. In particular, you previsouly would sometimes end up on a completley unrelated commit if someone else commits to a different branch in between the time we push a revision and pull it back from the server. This changes to instead update to the branch tip of the branch we were on at the beginning of the push. This should be either the revision we just pushed or a linear descendent of the revision we just pushed, with a fair degree of reliability.

#!/bin/sh

RSVN="`pwd`/rsvn.py"
export PATH=/bin:/usr/bin
mkdir temp
cd temp

svnadmin create repo
svn co file://`pwd`/repo wc

cd wc
mkdir trunk branches
cd trunk
for a in alpha beta gamma ; do
    echo $a > $a
done
cd ..
svn add *
svn ci -m 'initial'

svn up
svn cp trunk branches/test
svn ci -m 'branch'

svn up
echo foo >> branches/test/alpha
svn ci -m 'Mod.'

cd ..
echo rdelete trunk > tmp
echo rcopy branches/test trunk >> tmp
python $RSVN --message=blah --username=evil `pwd`/repo < tmp

svnadmin dump repo > ../replace_trunk_with_branch.svndump