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

mkdir temp
cd temp

mkdir project-orig
cd project-orig
mkdir trunk
cd ..

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

svn co $svnurl project
cd project/trunk
echo text > text1
echo text > text2
touch empty1
touch empty2
python -c "file('binary1', 'wb').write('a\x00b')"
python -c "file('binary2', 'wb').write('a\x00b')"
svn add text1 text2 binary1 binary2 empty1 empty2
svn propset svn:mime-type application/octet-stream binary1 binary2
svn propset svn:executable yes binary1 text1 empty1
svn ci -m init
# switch exec properties
svn propdel svn:executable binary1 text1 empty1
svn propset svn:executable yes binary2 text2 empty2
svn ci -m changeexec
cd ../..

svnadmin dump testrepo > ../executebit.svndump