Mercurial > hgsubversion
view tests/fixtures/commit-to-tag.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 | 9e6499c415a9 |
children |
line wrap: on
line source
#!/bin/sh mkdir temp cd temp svnadmin create repo REPOPATH="file://`pwd`/repo" svn co $REPOPATH wc cd wc mkdir -p branches/magic trunk tags svn add * svn ci -m 'btt' cd branches/magic for a in alpha beta gamma; do echo $a > $a svn add $a svn ci -m "Add file $a" done cd ../.. svn up svn cp $REPOPATH/branches/magic $REPOPATH/tags/will-edit -m 'Make tag to edit' svn up cd branches/magic for a in delta iota lambda; do echo $a > $a svn add $a svn ci -m "Add file $a" done cd ../.. cd tags/will-edit svn rm alpha svn ci -m 'removed alpha on a tag. Moves tag, implicit branch.' cd ../.. cd branches/magic for a in omega; do echo $a > $a svn add $a svn ci -m "Add file $a" done cd ../.. svn up svn cp $REPOPATH/branches/magic $REPOPATH/tags/also-edit -m 'Make tag to edit' svn up echo not omega > branches/magic/omega echo not omega > tags/also-edit/omega svn ci -m 'edit both the tag and its source branch at the same time' echo more stupidity > tags/also-edit/omega svn ci -m 'Edit an edited tag.' svn cp $REPOPATH/tags/also-edit $REPOPATH/tags/did-edits -m 'Tag an edited tag' svn cp $REPOPATH/branches/magic $REPOPATH/branches/closeme -m 'Make extra branch for another bogus case' svn cp $REPOPATH/branches/closeme $REPOPATH/tags/edit-later -m 'Make tag to edit after branch closes' svn rm $REPOPATH/branches/closeme -m 'Close the branch' svn up echo boofar > tags/edit-later/delta svn ci -m 'Edit this tag after its parent closed' # try and revert will-edit to its original state svn up svn merge -r9:8 $REPOPATH . svn ci -m 'Revert revision 9.' # make a tag from a branch and edit it at the same time svn up svn cp branches/magic tags/edit-at-create echo alpha >> tags/edit-at-create/alpha svn ci -m 'make a tag from a branch and edit it at the same time' cd ../.. svnadmin dump temp/repo > commit-to-tag.svndump echo echo 'Complete.' echo 'You probably want to clean up temp now.' echo 'Dump in commit-to-tag.svndump' exit 0