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 || exit 1
cd temp
svnadmin create repo
svn co file://`pwd`/repo wc
pushd wc
mkdir -p project/trunk
svn add project
svn ci -m 'trunk'
cd project/trunk
echo a > a
mkdir narf
svn add a narf
svn ci -m 'file and empty dir'
popd
svnadmin dump repo > ../empty_dir_in_trunk_not_repo_root.svndump
echo 'dump in empty_dir_in_trunk_not_repo_root.svndump'
echo 'you can probably delete temp now'