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 truncatedhistory.svndump
#

mkdir temp
cd temp

mkdir project-orig
cd project-orig
mkdir project1
mkdir project2
cd ..

svnadmin create testrepo
svnurl=file://`pwd`/testrepo
svn import project-orig $svnurl -m "init project"

svn co $svnurl project
# Make a single revision in trunk
cd project/project1
echo a > a
svn add a
svn ci -m "add a"
cd ..
svn up
# Rename the project
svn mv project1 project2/trunk
svn ci -m "rename project1"
cd project2/trunk
echo b > b
svn add b
svn ci -m "add b"
cd ../../..

svnadmin dump testrepo > ../truncatedhistory.svndump