Mercurial > hgsubversion

comparison tests/fixtures/replace_branch_with_branch.sh @ 587:c06f59441f8e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
editor: fix replaced directory copies Known failures: - Replaced directories copy records are wrong in stupid mode - Replaced files copy records are probably wrong in all modes
author Patrick Mezard <pmezard@gmail.com>
date Tue, 02 Mar 2010 17:06:06 +0100
parents 44c56a7727c4
children 2723152c8111
comparison
equal deleted inserted replaced
586:704d2ce1d906 587:c06f59441f8e
20 svn cp trunk branches/branch1 20 svn cp trunk branches/branch1
21 svn ci -m 'branch1' 21 svn ci -m 'branch1'
22 svn up 22 svn up
23 echo b > branches/branch1/b 23 echo b > branches/branch1/b
24 echo d > branches/branch1/d 24 echo d > branches/branch1/d
25 svn add branches/branch1/b branches/branch1/d 25 mkdir branches/branch1/dir
26 echo e > branches/branch1/dir/e
27 svn add branches/branch1/b branches/branch1/d branches/branch1/dir
26 svn ci -m 'add b to branch1' 28 svn ci -m 'add b to branch1'
27 svn cp trunk branches/branch2 29 svn cp trunk branches/branch2
28 svn ci -m 'branch2' 30 svn ci -m 'branch2'
29 svn up 31 svn up
30 echo c > branches/branch2/c 32 echo c > branches/branch2/c
31 svn add branches/branch2/c 33 mkdir branches/branch2/dir
34 echo e2 > branches/branch2/dir/e
35 svn add branches/branch2/c branches/branch2/dir
32 svn ci -m 'add c to branch2' 36 svn ci -m 'add c to branch2'
33 svn up 37 svn up
34 38
35 # Clobber branch1 with branch2 39 # Clobber branch1 with branch2
36 cd .. 40 cd ..
37 cat > clobber.rsvn <<EOF 41 cat > clobber.rsvn <<EOF
38 rdelete branches/branch1 42 rdelete branches/branch1
39 rcopy branches/branch2 branches/branch1 43 rcopy branches/branch2 branches/branch1
40 rcopy branches/branch1/d branches/branch1/a 44 rcopy branches/branch1/d branches/branch1/a
45 rcopy branches/branch1/dir branches/branch1/dir
46 rcopy branches/branch1/dir branches/branch1/dir2
41 EOF 47 EOF
42 48
43 python $RSVN --message=blah --username=evil `pwd`/repo < clobber.rsvn 49 python $RSVN --message=blah --username=evil `pwd`/repo < clobber.rsvn
44 50
45 svnadmin dump repo > ../replace_branch_with_branch.svndump 51 svnadmin dump repo > ../replace_branch_with_branch.svndump