Re: [PATCH] Ignore commits for which cvsps can't identify a branch

From: Junio C Hamano <junkio@cox.net>
Date: Feb 10, 2006, 21:21 UTC
Message-ID: <7vmzgyvrih.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <200602102102.k1AL2Xkd010415@biesi.no-ip.org>

Christian Biesinger <cbiesinger@web.de> writes:

Show 8 quoted lines

> cvps sometimes can't identify a branch for a specific revision, it shows
> messages like:
>   WARNING: revision 1.36.2.2 of file Makefile.in on unnamed branch
> and uses #CVSPS_NO_BRANCH as branch name in its output.
>
> This checkin makes it so that git-cvsimport ignores such branches,
> and when they
> appear as ancestor branch, it maps them to HEAD.

Does continuing with this kind of "fixups" produce usable history, perhaps just some changes missing but trees contained in other commits are still faithful reproductions of what the CVS repository would have given you? Or does it result in unusable history?

Depending on the nature of corruption and its expected use, sometimes silently corrupt conversion result is worse than not having it at all. If you are going to use it primarily for archaeology, it is much more useful to have a more-or-less correct conversion than not having anything at all, but if you are building on top of it, you at least would want to have the correct tree at the tip of the branch you build upon. I cannot offhand tell how this workaround affects the conversion result, hence this question.

> I hope I did this right, I'm not so familiar with git...

The only gripe I might have is your log message is too wide. Other than that it looks like it properly follows the the formatting and submitting convention.