Mercurial > hgsubversion
view tests/fixtures/branchtagcollision.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 | f28e0f54a6ef |
children |
line wrap: on
line source
#!/bin/bash # # Generate branchtagcollision.svndump # # Generates an svn repository with a branch and a tag that have the same name. mkdir temp cd temp svnadmin create testrepo svn checkout file://`pwd`/testrepo client cd client mkdir trunk mkdir branches mkdir tags svn add trunk branches tags svn commit -m "Initial commit" echo "fileA" >> trunk/fileA svn add trunk/fileA svn commit -m "Added fileA" svn cp trunk branches/A svn commit -m "added branch" echo "fileB" >> trunk/fileB svn add trunk/fileB svn commit -m "Added fileB" svn cp trunk tags/A svn commit -m "added bad tag" cd .. svnadmin dump testrepo > ../branchtagcollision.svndump