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
#
# Generate simple_branch.svndump
#

mkdir temp
cd temp

mkdir project-orig
cd project-orig
mkdir trunk branches tags
cd ..

svnadmin create testrepo
svnurl=file://`pwd`/testrepo
svn import --username durin project-orig $svnurl -m "Empty dirs."

svn co $svnurl project
cd project
echo 'file: alpha' > trunk/alpha
svn add trunk/alpha
svn ci --username durin -m 'Add alpha'
echo 'Data of beta' > trunk/beta
svn add trunk/beta
svn ci --username durin -m 'Add beta'
svn up
svn cp trunk branches/the_branch
svn ci --username durin -m 'Make a branch'
cd ..

svnadmin dump testrepo > ../simple_branch.svndump