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/bash
set -e
mkdir temp
cd temp
svnadmin create repo
svn co file://`pwd`/repo wc
cd wc
mkdir branches trunk tags
svn add *
svn ci -m 'btt'
echo foo > trunk/foo
svn add trunk/foo
svn ci -m 'add file'
svn up
svn rm trunk
svn ci -m 'delete trunk'
svn up
cd ..
svn cp -m 'restore trunk' file://`pwd`/repo/trunk@2 file://`pwd`/repo/trunk
cd wc
svn up
echo bar >> trunk/foo
svn ci -m 'append to file'
svn up
cd ../..
svnadmin dump temp/repo > delete_restore_trunk.svndump
echo
echo 'Complete.'
echo 'You probably want to clean up temp now.'
echo 'Dump in branch_delete_parent_dir.svndump'
exit 0