Mercurial > hgsubversion
view tests/fixtures/replace_trunk.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 | 22162380c4b9 |
children |
line wrap: on
line source
#!/bin/sh RSVN="`pwd`/rsvn.py" export PATH=/bin:/usr/bin mkdir temp cd temp svnadmin create repo svn co file://`pwd`/repo wc cd wc mkdir trunk branches cd trunk for a in alpha beta gamma ; do echo $a > $a done cd .. svn add * svn ci -m 'initial' svn up svn cp trunk branches/test svn ci -m 'branch' svn up echo foo >> branches/test/alpha svn ci -m 'Mod.' cd .. echo rdelete trunk > tmp echo rcopy branches/test trunk >> tmp python $RSVN --message=blah --username=evil `pwd`/repo < tmp svnadmin dump repo > ../replace_trunk_with_branch.svndump