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/bash
#
# Generate branchtagcollision.svndump
#
# Generates an svn repository with a branch and a tag that have the same name.


mkdir temp
cd temp

svnadmin create testrepo
svn checkout file://`pwd`/testrepo client

cd client
mkdir trunk
mkdir branches
mkdir tags

svn add trunk branches tags
svn commit -m "Initial commit"

echo "fileA" >> trunk/fileA
svn add trunk/fileA
svn commit -m "Added fileA"

svn cp trunk branches/A
svn commit -m "added branch"

echo "fileB" >> trunk/fileB
svn add trunk/fileB
svn commit -m "Added fileB"

svn cp trunk tags/A
svn commit -m "added bad tag"

cd ..
svnadmin dump testrepo > ../branchtagcollision.svndump