Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 6542:e7810e61f7c1 | 6543:a6e2e60b34d0 |
|---|---|
| 25 mkdir projA | 25 mkdir projA |
| 26 cd projA | 26 cd projA |
| 27 mkdir trunk | 27 mkdir trunk |
| 28 echo a > trunk/a | 28 echo a > trunk/a |
| 29 mkdir trunk/d1 | 29 mkdir trunk/d1 |
| 30 mkdir trunk/d2 | |
| 30 echo b > trunk/d1/b | 31 echo b > trunk/d1/b |
| 31 echo c > trunk/d1/c | 32 echo c > trunk/d1/c |
| 33 echo d > trunk/d2/d | |
| 32 cd .. | 34 cd .. |
| 33 | 35 |
| 34 svnurl=file://$svnpath/svn-repo/projA | 36 svnurl=file://$svnpath/svn-repo/projA |
| 35 svn import -m "init projA" projA $svnurl | fix_path | 37 svn import -m "init projA" projA $svnurl | fix_path |
| 36 | 38 |
| 48 svn ci -m createtrunk | 50 svn ci -m createtrunk |
| 49 mkdir subproject/branches | 51 mkdir subproject/branches |
| 50 svn add subproject/branches | 52 svn add subproject/branches |
| 51 svn ci -m createbranches | 53 svn ci -m createbranches |
| 52 svn mv $svnurl/subproject/d1 $svnurl/subproject/trunk/d1 -m moved1 | 54 svn mv $svnurl/subproject/d1 $svnurl/subproject/trunk/d1 -m moved1 |
| 55 svn mv $svnurl/subproject/d2 $svnurl/subproject/trunk/d2 -m moved2 | |
| 53 svn up | 56 svn up |
| 54 "$TESTDIR/svn-safe-append.py" b subproject/trunk/d1/b | 57 "$TESTDIR/svn-safe-append.py" b subproject/trunk/d1/b |
| 55 svn ci -m changeb | 58 svn rm subproject/trunk/d2 |
| 59 svn ci -m "changeb and rm d2" | |
| 56 svn mv $svnurl/subproject/trunk/d1 $svnurl/subproject/branches/d1 -m moved1again | 60 svn mv $svnurl/subproject/trunk/d1 $svnurl/subproject/branches/d1 -m moved1again |
| 61 echo % copy a directory from a past revision | |
| 62 svn copy -r 7 $svnurl/subproject/trunk/d2 $svnurl/subproject/trunk -m copydirfrompast | |
| 57 cd .. | 63 cd .. |
| 58 | 64 |
| 59 echo % convert trunk and branches | 65 echo % convert trunk and branches |
| 60 hg convert --datesort $svnurl/subproject A-hg | 66 hg convert --datesort $svnurl/subproject A-hg |
| 61 | 67 |