Mercurial > hgsubversion
view tests/fixtures/simple_branch.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 | bb00f7ca5b8c |
children |
line wrap: on
line source
#!/bin/sh # # Generate simple_branch.svndump # mkdir temp cd temp mkdir project-orig cd project-orig mkdir trunk branches tags cd .. svnadmin create testrepo svnurl=file://`pwd`/testrepo svn import --username durin project-orig $svnurl -m "Empty dirs." svn co $svnurl project cd project echo 'file: alpha' > trunk/alpha svn add trunk/alpha svn ci --username durin -m 'Add alpha' echo 'Data of beta' > trunk/beta svn add trunk/beta svn ci --username durin -m 'Add beta' svn up svn cp trunk branches/the_branch svn ci --username durin -m 'Make a branch' cd .. svnadmin dump testrepo > ../simple_branch.svndump