Mercurial > public > mercurial-scm > hg
diff tests/svn/svndump-replace.sh @ 13052:5fb924ee44d5 stable
convert/svn: fix changed files list upon directory replacements
When branch2/dir was replacing branch1/dir, we only marked branch2/dir files a
changed. Add branch1/dir files as they may not exist in branch2.
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Mon, 29 Nov 2010 20:13:11 +0100 |
| parents | a9b427b5821e |
| children |
line wrap: on
line diff
--- a/tests/svn/svndump-replace.sh Fri Nov 26 20:05:16 2010 -0600 +++ b/tests/svn/svndump-replace.sh Mon Nov 29 20:13:11 2010 +0100 @@ -17,6 +17,8 @@ ln -s d dlink ln -s d dlink2 ln -s d dlink3 +mkdir d2 +echo a > d2/a cd .. svn add * svn ci -m 'initial' @@ -50,6 +52,30 @@ python $RSVN --message=clobber2 --username=evil `pwd`/repo < clobber.rsvn +# Create d2 in branch so d2 has 'a' is in branch/d2 and trunk/d2, +# 'b' is in trunk/d2 and 'c' is in branch/d2 +cd wc/trunk +echo b > d2/b +svn add d2/b +svn ci -m adddb +cd .. +svn up +svn cp trunk branches/branch +cd branches/branch +svn rm d2/b +echo c > d2/c +svn add d2/c +cd ../.. +svn ci -m branch +svn up +cd .. + +cat > clobber.rsvn <<EOF +rdelete trunk/d2 +rcopy branches/branch/d2 trunk/d2 +EOF +python $RSVN --message=clobberdir --username=evil `pwd`/repo < clobber.rsvn + svn log -v file://`pwd`/repo svnadmin dump repo > ../replace.svndump