Mercurial > hgsubversion
view tests/fixtures/addspecial.sh @ 1236:f367a4462191
push: update to branch tip instead of tip
We previously updated to the repository tip after pushing a revision,
presumably on the assumption that tip would be the last revision we
just pushed. This assumption is flawed for high traffic repositories.
In particular, you previsouly would sometimes end up on a completley
unrelated commit if someone else commits to a different branch in
between the time we push a revision and pull it back from the server.
This changes to instead update to the branch tip of the branch we were
on at the beginning of the push. This should be either the revision
we just pushed or a linear descendent of the revision we just pushed,
with a fair degree of reliability.
| author | David Schleimer <dschleimer@fb.com> |
|---|---|
| date | Sat, 30 Aug 2014 09:23:31 -0700 |
| 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