Dmitry Mikhin <dmitrym@acres.com.au> writes:
> Follow up to the previous message with the same bug report. I
> simplified the CVS repo to obtain the minimal (minimal possible? :))
> repository reproducing the bug.
I cannot reproduce this bug anymore with head (r819, from the new
repository http://svn.collab.net/repos/cvs2svn/trunk/) of cvs2svn.
Please let us know if you still see the problem.
Note that according to the RCS file, the file should not exist on the
heads of branches 'owwe2' and 'owwe3' (therefore those branches should
be pruned out of the head of the svn repository), but the file is
still present on branch 'owwe41'. This is exactly the result I get
now.
-Karl
> [dima@light svn-test]$ cvs2svn -s ~/tmp/svn-test/test --create
> --skip-cleanup ~/repository/test/
> ----- pass 1 -----
> /home/dima/repository/test/include/param_zt.inc,v
> ----- pass 2 -----
> ----- pass 3 -----
> ----- pass 4 -----
> creating repos '/home/dima/tmp/svn-test/test'
> committing: Wed Jan 15 16:51:59 2003, over 0 seconds
> adding or changing 1.1 : 'trunk/include/param_zt.inc'
> new revision: 1
> committing: Thu Jan 16 10:46:39 2003, over 0 seconds
> deleting 1.1.4.1 : 'branches/owwe3/include/param_zt.inc'
> loading revision 1 into '/home/dima/tmp/svn-test/test'
> new revision: 2
> committing: Fri Jan 17 11:04:20 2003, over 0 seconds
> deleting 1.1.2.1 : 'branches/owwe2/include/param_zt.inc'
> loading revision 2 into '/home/dima/tmp/svn-test/test'
> new revision: 3
> committing: Fri Jan 17 17:18:54 2003, over 0 seconds
> loading revision 3 into '/home/dima/tmp/svn-test/test'
> adding or changing 1.2 : 'trunk/include/param_zt.inc'
> new revision: 4
> committing: Fri Jan 17 17:26:24 2003, over 0 seconds
> loading revision 4 into '/home/dima/tmp/svn-test/test'
> adding or changing 1.3 : 'trunk/include/param_zt.inc'
> new revision: 5
> Finishing branches:
> finishing 'ImportAll' as branch
> finishing 'owwe_as_is_plus_matlab' as branch
> finishing 'owwe_as_is' as branch
> finishing 'owwe41' as branch
> loading revision 5 into '/home/dima/tmp/svn-test/test'
> finishing 'owwe3' as branch
> loading revision 6 into '/home/dima/tmp/svn-test/test'
> finishing 'owwe2' as branch
> loading revision 7 into '/home/dima/tmp/svn-test/test'
> Finishing tags:
> finishing 'ImportAll' as tag
> loading revision 8 into '/home/dima/tmp/svn-test/test'
> finishing 'owwe_as_is_plus_matlab' as tag
> loading revision 9 into '/home/dima/tmp/svn-test/test'
> finishing 'owwe_as_is' as tag
> loading revision 10 into '/home/dima/tmp/svn-test/test'
> finishing 'owwe41' as tag
> finishing 'owwe3' as tag
> finishing 'owwe2' as tag
> loading revision 11 into '/home/dima/tmp/svn-test/test'
> ----- pass 5 -----
> pass 1: 0 seconds
> pass 2: 0 seconds
> pass 3: 0 seconds
> pass 4: 14 seconds
> pass 5: 0 seconds
> total: 14 seconds
>
> [dima@light svn-test]$ mkdir svn; cd svn
>
> [dima_at_light svn-test]$ svn co svn+ssh://light/test/branches/owwe3 owwe3
> A owwe3/include
> A owwe3/include/param_zt.inc
> Checked out revision 11.
>
> [dima_at_light svn-test]$ svn co svn+ssh://light/test/trunk test
> A test/include
> A test/include/param_zt.inc
> Checked out revision 11.
>
>
> Compare with:
>
> [dima@light svn-test]$ mkdir cvs; cd cvs
>
> [dima@light cvs]$ cvs -d ~/repository co test
> cvs checkout: Updating test
> cvs checkout: Updating test/include
> U test/include/param_zt.inc
>
> [dima@light cvs]$ cvs -d ~/repository co -r owwe3 -d owwe3 test
> cvs checkout: Updating owwe3
> cvs checkout: Updating owwe3/include
>
>
> So, subversion preserves the file both in the trunk and the branch,
> while cvs keeps it in the trunk only.
>
>
> Best wishes,
> Dmitry
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Mar 11 20:09:29 2004