view tests/fixtures/addspecial.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 b6b1365e3489
children
line wrap: on
line source

#!/bin/sh

mkdir temp
cd temp

svnadmin create repo
svn co file://`pwd`/repo wc
cd wc

mkdir -p trunk branches
svn add trunk branches
svn ci -m'initial structure'
cd trunk
echo a>a
svn add a
svn ci -mci1 a
cd ..
svn up
svn cp trunk branches/foo
svn ci -m'branch foo'
cd branches/foo
ln -s a fnord
svn add fnord
svn ci -msymlink fnord
mkdir 'spacy name'
echo a > 'spacy name/spacy file'
svn add 'spacy name'
svn ci -mspacy 'spacy name'
svn up
echo b > 'spacy name/surprise ~'
svn add 'spacy name/surprise ~'
svn ci -mtilde 'spacy name'
svn up ../..
echo foo > exe
chmod +x exe
svn add exe
svn ci -mexecutable exe
svn up ../..
cd ../../trunk
svn merge ../branches/foo
svn ci -mmerge
svn up

pwd
cd ../../..
svnadmin dump temp/repo > addspecial.svndump
echo
echo 'Complete.'
echo 'You probably want to clean up temp now.'
echo 'Dump in addspecial.svndump'
exit 0