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

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