Mercurial > hg
diff tests/test-convert-svn-move @ 6543:a6e2e60b34d0
convert: handle past or foreign partial svn copies
Subversion allows revisions to be composed of subparts coming from revisions
before the parent or from other part of the repository. There is no simple
representation for these now, keep the changes but do not track their origins.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Mon, 14 Apr 2008 22:31:34 +0200 |
parents | c1b47c0fd2b6 |
children | 075b2c9aed37 |
line wrap: on
line diff
--- a/tests/test-convert-svn-move Mon Apr 14 22:31:33 2008 +0200 +++ b/tests/test-convert-svn-move Mon Apr 14 22:31:34 2008 +0200 @@ -27,8 +27,10 @@ mkdir trunk echo a > trunk/a mkdir trunk/d1 +mkdir trunk/d2 echo b > trunk/d1/b echo c > trunk/d1/c +echo d > trunk/d2/d cd .. svnurl=file://$svnpath/svn-repo/projA @@ -50,10 +52,14 @@ svn add subproject/branches svn ci -m createbranches svn mv $svnurl/subproject/d1 $svnurl/subproject/trunk/d1 -m moved1 +svn mv $svnurl/subproject/d2 $svnurl/subproject/trunk/d2 -m moved2 svn up "$TESTDIR/svn-safe-append.py" b subproject/trunk/d1/b -svn ci -m changeb +svn rm subproject/trunk/d2 +svn ci -m "changeb and rm d2" svn mv $svnurl/subproject/trunk/d1 $svnurl/subproject/branches/d1 -m moved1again +echo % copy a directory from a past revision +svn copy -r 7 $svnurl/subproject/trunk/d2 $svnurl/subproject/trunk -m copydirfrompast cd .. echo % convert trunk and branches