view tests/fixtures/file_not_in_trunk_root.sh @ 933:a9f315eae67c

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.
author David Schleimer <dschleimer@fb.com>
date Mon, 24 Sep 2012 10:18:28 -0700
parents b20a6c149021
children
line wrap: on
line source

#!/bin/sh
mkdir temp
cd temp
svnadmin create repo
svn co file://`pwd`/repo wc
cd wc
mkdir branches trunk tags
svn add *
svn ci -m 'btt'
cd trunk
mkdir narf
cd narf
for a in alpha beta gamma delta ; do
    echo $a > $a
done
cd ..
svn add narf
svn ci -m 'Add files.'
cd ../../..
svnadmin dump temp/repo > file_not_in_trunk_root.svndump
echo
echo 'Complete.'
echo 'You probably want to clean up temp now.'
echo 'Dump in file_not_in_trunk_root.svndump'
exit 0