push: use native rebase instead of our rebase wrapper Our rebase wrapper doesn't quite do the right thing with repect to a just-pushed revision. In particular, it will try to rebase the just-pushed revision on top of the version of that revision we just pulled down from svn. This will sometimes result in a local revision with an identical commit message as the revision from svn, but no file changes. This changes the rebase portion of the push command to instead use the native rebase with a revset that excludes the revision we just pushed to svn from the set to be rebased. It also moves to a single strip operation that removes all of the revisions based on a pre-push or partially pushed revision. This moves to a separate rebase and strip operation since we now need to strip revisions we are not rebasing.

#!/bin/sh

mkdir temp
cd temp
svnadmin create repo
svn co file://`pwd`/repo wc
export REPO=file://`pwd`/repo
cd wc
mkdir branches trunk tags
svn add *
svn ci -m 'Empty dirs.'

echo 'file: alpha' > trunk/alpha
svn add trunk/alpha
svn ci -m 'Add alpha'
svn up

echo 'Data of beta' > trunk/beta
svn add trunk/beta
svn ci -m 'Add beta'
svn up
cd ..

svn cp -m 'tagging r3' $REPO/trunk@3 $REPO/tags/tag_r3
svn cp -m 'tag from a tag' $REPO/tags/tag_r3 $REPO/tags/copied_tag
svn mv -m 'rename a tag' $REPO/tags/copied_tag $REPO/tags/other_tag_r3
cd ..
svnadmin dump temp/repo > rename_tag_test.svndump
echo
echo 'Complete.'
echo 'You probably want to clean up temp now.'
echo 'Dump in renametagdir.svndump'
exit 0