Mercurial > hgsubversion
view tests/fixtures/addspecial.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 | b6b1365e3489 |
children |
line wrap: on
line source
#!/bin/sh mkdir temp cd temp svnadmin create repo svn co file://`pwd`/repo wc cd wc mkdir -p trunk branches svn add trunk branches svn ci -m'initial structure' cd trunk echo a>a svn add a svn ci -mci1 a cd .. svn up svn cp trunk branches/foo svn ci -m'branch foo' cd branches/foo ln -s a fnord svn add fnord svn ci -msymlink fnord mkdir 'spacy name' echo a > 'spacy name/spacy file' svn add 'spacy name' svn ci -mspacy 'spacy name' svn up echo b > 'spacy name/surprise ~' svn add 'spacy name/surprise ~' svn ci -mtilde 'spacy name' svn up ../.. echo foo > exe chmod +x exe svn add exe svn ci -mexecutable exe svn up ../.. cd ../../trunk svn merge ../branches/foo svn ci -mmerge svn up pwd cd ../../.. svnadmin dump temp/repo > addspecial.svndump echo echo 'Complete.' echo 'You probably want to clean up temp now.' echo 'Dump in addspecial.svndump' exit 0