Mercurial > hgsubversion
view tests/fixtures/copies.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 | 64d961130a07 |
| children |
line wrap: on
line source
#!/bin/sh # # Generate copies.svndump # rm -rf temp mkdir temp cd temp mkdir -p import/trunk/dir echo a > import/trunk/dir/a svnadmin create testrepo svnurl=file://`pwd`/testrepo svn import import $svnurl -m init svn co $svnurl project cd project svn cp trunk/dir trunk/dir2 echo b >> trunk/dir2/a svn ci -m 'copy/edit trunk/dir/a' svn up svn cp trunk/dir2 trunk/dir3 svn ci -m 'copy dir2 to dir3' svn rm trunk/dir3/a svn cp trunk/dir2/a trunk/dir3/a svn ci -m 'copy and remove' cd .. svnadmin dump testrepo > ../copies.svndump