Forum OpenACS Development: Re: cvs woes

Collapse
2: Re: cvs woes (response to 1)
Posted by russ m on
ouch! I'd try this on a copy of your cvsroot first, but you may be able to get away with doing another import of the last non-broken vendor sources, and then in your working copy doing a 3-way merge between the last good version and the new good version into your current -HEAD (which should be a null diff, but bring cvs's idea of -HEAD back to the right spot)... This would leave a record of the botched import in your repository, but should get your current development sources back on track....

NB: I haven't actually tried this myself, so it's all theoretical at this point...

Collapse
3: Re: cvs woes (response to 2)
Posted by Joel Aufrecht on
You might also try exporting from cvs with a date-stamp from just before the bad import, which will get you a file tree with good files.  Then import that back in to cvs.  Brute force and maybe confuses the logs a bit, but easier to understand than three-way merges.