← Back to team overview

nunit-core team mailing list archive

[Bug 120977] Re: cscvs breaks when a cvs merge creates a file

 

Although the traceback is certainly similar, that's not the same bug --
the "non extant" file being patched was not created by a merge.  In
fact, that file seems to have an entirely boring revision history, so I
don't know what's going on here at all (maybe a mv in the CVS repo?).
I'm interested to see if the new import succeeds!

Actually looking a bit more, it looks like someone _copied_ the ,v file
in the CVS repo -- I expect the new import will be fine.

-- 
cscvs breaks when a cvs merge creates a file
https://bugs.launchpad.net/bugs/120977
You received this bug notification because you are a member of NUnit
Developers, which is subscribed to NUnit V2.

Status in Launchpad's version of cscvs: Fix Released
Status in NUnit V2 Test Framework: Fix Released

Bug description:
This affects many imports, as can be seen on the https://help.launchpad.net/VcsImportRequests page.

It's something to do with 'dead' revisions.  When a file is created on a branch, it gets an entry in the log of the MAIN branch but with a 'dead' revision state, more commonly seen when a file is 'cvs rm'ed.  Then, when this branch is merged to MAIN, cvcvs freaks, with an exception like:

    On changeset MAIN.7669 ValueError: attempt to patch non extant file : docs/design/draft-missing-plugins.txt

This link is very relevant, and gives a recipe for the cscvs test suite:

http://ximbiot.com/cvs/wiki/index.php?title=CVS--Concurrent_Versions_System_v1.12.12.1:_Branching_and_merging#Merging_can_add_or_remove_files