view tests/fixtures/branch_prop_edit.sh @ 991:26e9fd21f3bf

push: avoid rebasing when we know there are no conflicts When pushing multiple commits, push would do one rebase per commit. This changes it track the files that have been changed as part of the push and only perform a rebase if the commit touches a file that has been changed previously. On our repo, push used to take 25 seconds per commit. With this change it takes closer to 10 seconds per commit (if there are no conflicts).
author Durham Goode <durham@fb.com>
date Wed, 02 Jan 2013 17:54:30 -0800
parents cf6fe8457570
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
svn add *
svn ci -m 'branches trunk'
svn up

cd trunk
for a in alpha beta gamma ; do
    echo $a > $a
    svn add $a
done
svn ci -m 'Files.'
cd ..
svn up

svn cp trunk branches/dev_branch
svn ci -m 'make a branch'
svn up

cd branches/dev_branch
echo epsilon > epsilon
svn add epsilon
svn ci -m 'Add a file on the branch.'
svn up
cd ../..

cd branches/dev_branch
svn ps 'svn:ignore' 'delta' .
svn ci -m 'Commit bogus propchange.'
svn up
cd ../../..

pwd
svnadmin dump repo > ../branch_prop_edit.svndump
cd ..
echo 'Dump created in branch_prop_edit.svndump. You can probably delete temp.'
exit 0