Mercurial > hgsubversion
view tests/fixtures/subprojects.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 | 9a7e3dbd0f6e |
children |
line wrap: on
line source
#!/usr/bin/env bash set -e mkdir temp cd temp svnadmin create testrepo svn checkout file://`pwd`/testrepo client cd client mkdir trunk mkdir -p branches mkdir -p tags svn add trunk branches tags svn commit -m "Initial commit" mkdir trunk/project trunk/other echo "project trunk" > trunk/project/file echo "other trunk" > trunk/other/phile svn add trunk/project trunk/other svn commit -m "Added file and phile in trunk" svn up svn cp trunk tags/tag_from_trunk svn ci -m 'created tag from trunk' svn up svn cp trunk branches/branch svn ci -m 'created branch from trunk' svn up echo "project branch" > branches/branch/project/file svn ci -m "committed to the project branch" svn up echo "trunk2" > trunk/project/file svn ci -m "committed to trunk again" svn up echo "other branch" > branches/branch/other/phile svn ci -m "committed to the other branch" svn up svn cp branches/branch tags/tag_from_branch svn ci -m "create tag from branch" cd .. svnadmin dump testrepo > ../subprojects.svndump echo "Created subprojects.svndump" echo "You might want to clean up ${PWD} now"