Mercurial > hgsubversion

view tests/fixtures/replace_branch_with_branch.sh @ 933:a9f315eae67c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
push: use native rebase instead of our rebase wrapper Our rebase wrapper doesn't quite do the right thing with repect to a just-pushed revision. In particular, it will try to rebase the just-pushed revision on top of the version of that revision we just pulled down from svn. This will sometimes result in a local revision with an identical commit message as the revision from svn, but no file changes. This changes the rebase portion of the push command to instead use the native rebase with a revset that excludes the revision we just pushed to svn from the set to be rebased. It also moves to a single strip operation that removes all of the revisions based on a pre-push or partially pushed revision. This moves to a separate rebase and strip operation since we now need to strip revisions we are not rebasing.
author David Schleimer <dschleimer@fb.com>
date Mon, 24 Sep 2012 10:18:28 -0700
parents 2723152c8111
children
line wrap: on
line source

#!/bin/sh

RSVN="`pwd`/rsvn.py"
export PATH=/bin:/usr/bin
mkdir temp
cd temp

svnadmin create repo
svn co file://`pwd`/repo wc

cd wc
mkdir trunk branches
cd trunk
echo a > a
cd ..
svn add *
svn ci -m 'initial'

svn up
svn cp trunk branches/branch1
svn ci -m 'branch1'
svn up
echo b > branches/branch1/b
echo d > branches/branch1/d
mkdir branches/branch1/dir
echo e > branches/branch1/dir/e
echo f > branches/branch1/f
echo g > branches/branch1/g
svn add branches/branch1/b branches/branch1/d branches/branch1/dir \
    branches/branch1/f branches/branch1/g
svn ci -m 'add b to branch1'
svn cp trunk branches/branch2
svn ci -m 'branch2'
svn up
echo c > branches/branch2/c
mkdir branches/branch2/dir
echo e2 > branches/branch2/dir/e
echo f2 > branches/branch2/f
svn add branches/branch2/c branches/branch2/dir branches/branch2/f
svn ci -m 'add c to branch2'
svn up

# Clobber branch1 with branch2
cd ..
cat > clobber.rsvn <<EOF
rdelete branches/branch1
rcopy branches/branch2 branches/branch1
rcopy branches/branch1/d branches/branch1/a
rcopy branches/branch1/dir branches/branch1/dir
rcopy branches/branch1/dir branches/branch1/dir2
rcopy branches/branch1/f branches/branch1/f
rcopy branches/branch1/g branches/branch1/g
EOF

python $RSVN --message=blah --username=evil `pwd`/repo < clobber.rsvn

svnadmin dump repo > ../replace_branch_with_branch.svndump