view tests/fixtures/movetotrunk.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 b729909d3793
children
line wrap: on
line source

#!/bin/sh
#
# Generate movetotrunk.svndump
#

mkdir temp
cd temp

mkdir project-orig
cd project-orig
cd ..

svnadmin create testrepo
svnurl=file://`pwd`/testrepo
svn mkdir --parents $svnurl/sub1/sub2 -m subpaths
svn import project-orig $svnurl/sub1/sub2 -m "init project"

svn co $svnurl/sub1/sub2 project
cd project
echo a > a
svn add a
mkdir dir
echo b > dir/b
svn add dir
svn ci -m adda
svn up
mkdir trunk
svn add trunk
svn mv a trunk/a
svn mv dir trunk/dir
svn ci -m 'move to trunk'
cd ..

svnadmin dump testrepo > ../movetotrunk.svndump