From: Yann Dirson Date: Sat, 17 Jun 2006 21:27:41 GMT Subject: Re: [PATCH] cvsimport: ignore CVSPS_NO_BRANCH and impossible branches Message-ID: <20060617212741.GT7766@nowhere.earth> In-Reply-To: <7vzmgb8plx.fsf@assigned-by-dhcp.cox.net> On Sat, Jun 17, 2006 at 02:00:10PM -0700, Junio C Hamano wrote: > Martin Langhoff writes: > > > cvsps output often contains references to CVSPS_NO_BRANCH, commits that it > > could not trace to a branch. Ignore that branch. > > > > Additionally, cvsps will sometimes draw circular relationships between > > branches -- where two branches are recorded as opening from the other. > > In those cases, and where the ancestor branch hasn't been seen, ignore > > it. > > This sounds more like an workaround than a real fix to me, > although I'd apply it for now. I see Yann is collecting cvsps > patches but maybe there will be a real fix soonish? I have not dig yet into the cases that trigger CVSPS_NO_BRANCH so can't make any promise, unless someone comes in with a patch already written :) Since the patch seems to ensure the user gets warned when a branch gets ignored this way, allowing it in could probably allow at least some people to have cvsimport does a partial job, rather than failing midway. Maybe a final warning when all patchsets could not be imported could be issued, so the existing ones do not get simply lost in the verbose output. Best regards, -- Yann Dirson | Debian-related: | Support Debian GNU/Linux: | Freedom, Power, Stability, Gratis http://ydirson.free.fr/ | Check