Mercurial > hgsubversion
view tests/fixtures/movetotrunk.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 | b729909d3793 |
children |
line wrap: on
line source
#!/bin/sh # # Generate movetotrunk.svndump # mkdir temp cd temp mkdir project-orig cd project-orig cd .. svnadmin create testrepo svnurl=file://`pwd`/testrepo svn mkdir --parents $svnurl/sub1/sub2 -m subpaths svn import project-orig $svnurl/sub1/sub2 -m "init project" svn co $svnurl/sub1/sub2 project cd project echo a > a svn add a mkdir dir echo b > dir/b svn add dir svn ci -m adda svn up mkdir trunk svn add trunk svn mv a trunk/a svn mv dir trunk/dir svn ci -m 'move to trunk' cd .. svnadmin dump testrepo > ../movetotrunk.svndump