Mercurial > hgsubversion

comparison tests/fixtures/replace_branch_with_branch.sh @ 588:2723152c8111

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stupid: fix getcopies() logic getcopies() assumed that copies where happening withing the current branch. This is wrong when a branch replaces another, and used to generate wrong copy records when copy sources existed in parent revision but were coming from an unrelated revision.
author Patrick Mezard <pmezard@gmail.com>
date Tue, 02 Mar 2010 17:06:06 +0100
parents c06f59441f8e
children
comparison
equal deleted inserted replaced
587:c06f59441f8e 588:2723152c8111
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 mkdir branches/branch1/dir 25 mkdir branches/branch1/dir
26 echo e > branches/branch1/dir/e 26 echo e > branches/branch1/dir/e
27 svn add branches/branch1/b branches/branch1/d branches/branch1/dir 27 echo f > branches/branch1/f
28 echo g > branches/branch1/g
29 svn add branches/branch1/b branches/branch1/d branches/branch1/dir \
30 branches/branch1/f branches/branch1/g
28 svn ci -m 'add b to branch1' 31 svn ci -m 'add b to branch1'
29 svn cp trunk branches/branch2 32 svn cp trunk branches/branch2
30 svn ci -m 'branch2' 33 svn ci -m 'branch2'
31 svn up 34 svn up
32 echo c > branches/branch2/c 35 echo c > branches/branch2/c
33 mkdir branches/branch2/dir 36 mkdir branches/branch2/dir
34 echo e2 > branches/branch2/dir/e 37 echo e2 > branches/branch2/dir/e
35 svn add branches/branch2/c branches/branch2/dir 38 echo f2 > branches/branch2/f
39 svn add branches/branch2/c branches/branch2/dir branches/branch2/f
36 svn ci -m 'add c to branch2' 40 svn ci -m 'add c to branch2'
37 svn up 41 svn up
38 42
39 # Clobber branch1 with branch2 43 # Clobber branch1 with branch2
40 cd .. 44 cd ..
42 rdelete branches/branch1 46 rdelete branches/branch1
43 rcopy branches/branch2 branches/branch1 47 rcopy branches/branch2 branches/branch1
44 rcopy branches/branch1/d branches/branch1/a 48 rcopy branches/branch1/d branches/branch1/a
45 rcopy branches/branch1/dir branches/branch1/dir 49 rcopy branches/branch1/dir branches/branch1/dir
46 rcopy branches/branch1/dir branches/branch1/dir2 50 rcopy branches/branch1/dir branches/branch1/dir2
51 rcopy branches/branch1/f branches/branch1/f
52 rcopy branches/branch1/g branches/branch1/g
47 EOF 53 EOF
48 54
49 python $RSVN --message=blah --username=evil `pwd`/repo < clobber.rsvn 55 python $RSVN --message=blah --username=evil `pwd`/repo < clobber.rsvn
50 56
51 svnadmin dump repo > ../replace_branch_with_branch.svndump 57 svnadmin dump repo > ../replace_branch_with_branch.svndump