Mercurial > hgsubversion
view tests/fixtures/simple_branch.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 | bb00f7ca5b8c |
children |
line wrap: on
line source
#!/bin/sh # # Generate simple_branch.svndump # mkdir temp cd temp mkdir project-orig cd project-orig mkdir trunk branches tags cd .. svnadmin create testrepo svnurl=file://`pwd`/testrepo svn import --username durin project-orig $svnurl -m "Empty dirs." svn co $svnurl project cd project echo 'file: alpha' > trunk/alpha svn add trunk/alpha svn ci --username durin -m 'Add alpha' echo 'Data of beta' > trunk/beta svn add trunk/beta svn ci --username durin -m 'Add beta' svn up svn cp trunk branches/the_branch svn ci --username durin -m 'Make a branch' cd .. svnadmin dump testrepo > ../simple_branch.svndump