List Info

Thread: Got a recipe for you - cvs2svn problem




Got a recipe for you - cvs2svn problem
user name
2006-06-04 13:39:54
Michael Haggerty wrote:
> A curious thing about the IMarshalledValue.java file is
that it has two
> pairs of commits with identical author+log within a
very short time of
> each other.

This coincidence doesn't seem to be important.  The bug is
still there
even if I manually change all of the log messages to be
distinct.

> Also, the
> first and last revisions of IMarshalledValue.java on
the Branch_4_0
> branch are both "dead".

I haven't yet figured out how to create this situation
using CVS, but
according to the CVS source code it appears to have
something to do with
committing a revision on a branch after the branch is
created, and
corrects a previous CVS bug where a repository checked out
with both
'-r' and '-D' options would improperly include a file
that hadn't been
added on the branch until later than the specified date. 
This code is
apparently triggered in CVS's "tagdate" test
case.

> The last commit generated by cvs2svn is
> 
>
------------------------------------------------------------
------------
> r17 | (no author) | 2006-05-11 04:23:22 +0200 (Thu, 11
May 2006) | 1 line
> Changed paths:
>    A /branches/Branch_4_0/IMarshalledValue.java (from
> /trunk/IMarshalledValue.java:9)
>    A /branches/Branch_4_0/SoftSet.java (from
/trunk/SoftSet.java:16)
> 
> This commit was manufactured by cvs2svn to create
branch 'Branch_4_0'.
>
------------------------------------------------------------
------------
> 
> This commit re-adds the IMarshalledValue.java file,
which was properly
> deleted in r15.

Perhaps even more curious is r10, which includes CVS's
generated log
message from the synthetic "dead" revision, but
doesn't modify any paths
at all:

------------------------------------------------------------
------------
r10 | csuconic | 2005-12-15 21:18:27 +0100 (Thu, 15 Dec
2005) | 2 lines
Changed paths:

file IMarshalledValue.java was added on branch Branch_4_0 on
2005-12-15
20:18:49 +0000

------------------------------------------------------------
------------

I'm still working on this.  But other people should of
course feel free
to jump in...

Michael

------------------------------------------------------------
---------
To unsubscribe, e-mail: dev-unsubscribecvs2svn.tigris.org
For additional commands, e-mail: dev-helpcvs2svn.tigris.org

[1]

about | contact  Other archives ( Real Estate discussion Medical topics )