Mercurial > hgsubversion
diff tests/fixtures/replace_branch_with_branch.sh @ 588:2723152c8111
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 |
line wrap: on
line diff
--- a/tests/fixtures/replace_branch_with_branch.sh +++ b/tests/fixtures/replace_branch_with_branch.sh @@ -24,7 +24,10 @@ echo b > branches/branch1/b echo d > branches/branch1/d mkdir branches/branch1/dir echo e > branches/branch1/dir/e -svn add branches/branch1/b branches/branch1/d branches/branch1/dir +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' @@ -32,7 +35,8 @@ svn up echo c > branches/branch2/c mkdir branches/branch2/dir echo e2 > branches/branch2/dir/e -svn add branches/branch2/c branches/branch2/dir +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 @@ -44,6 +48,8 @@ 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