On Aug 24, 2008, at 5:23 AM, Tom Browder wrote:

>> There were a couple other bugs we found in the way cvs2svn was  
>> dealing with
>> old revisions that were both active and in the attic as well as  
>> entire
>> deletion trees in the attic (which modern cvs doesn't do any  
>> more).  Since
>
> That's very interestiing, because in the projects I took over using
> CVS that is happening, and I've never seen that.  And we're using a
> modern CVS.  Do you have any idea how or why that happens?

There's lots of things that can cause the active and attic files  
problem, both valid and invalid iirc.  Aside from folks manually  
messing with files in the cvsroot (which is probably the *most*  
common cause), I believe some versions would track files that were  
deleted on a branch and active on head or vice-versa in that manner.   
Having entire subtrees of dead files in the attic, though, was  
specifically really old versions of CVS (like on old SGI server  
systems).  If the repository side of cvs used to be and older  
version, that might be the cause even if it has since been updated.   
Otherwise, I would suspect folks have been making edits to the ,v files.

>> those were easy enough to manually fix (compared to what it would  
>> take to
>> modify cvs2svn), the changes were just made to the repository  
>> prior to the
>> run and we left it at that.
>
> Remember how you fixed that?

For the subtrees in the attic, just had to move the subtrees up a  
directory (i.e. out of the attic) since the files are all properly  
marked as dead.  Since all files are dead, the subtrees are properly  
pruned as empty dirs.  We actually had a conflict dir where the same  
attic dir had been later readded with new content, but then it just  
required manually moving the dead ,v files into the readded dir.

For our case where we had files simultaneously dead and alive, the  
alive file consistently had the most up-to-date revisions so I just  
killed the old versions.  There were less than a half-dozen such  
files and none of them were important, otherwise I would have  
manually merged the ,v revision files for both copies.

Cheers!
Sean


-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
BRL-CAD Developer mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-devel

Reply via email to