Re: [PATCH] Rework cvsexportcommit to handle binary files for all cases.

From: Junio C Hamano <junkio@cox.net>
Date: Nov 14, 2006, 06:56 UTC
Message-ID: <7vmz6u3492.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <200611140749.05023.robin.rosenberg@dewire.com>

Robin Rosenberg <robin.rosenberg@dewire.com> writes:

Show 11 quoted lines

> tisdag 14 november 2006 01:47 skrev Junio C Hamano:
>>Robin Rosenberg wrote:
>>> I sent a patch earlier, which was not applied, due to imperfections that I 
>>> cannot solve fully. One issue was that patch 2.5.9 was required and hacking 
>>> it to handle binary diffs with spaces would require and even worse kludge,
>>
>>I suspect that we should not be using patch, but instead be
>>using git-apply perhaps with -C option if people want fuzz.
>
> Does git-apply work without a git repo? We're applying patches onto a CVS 
> repo.

I do it during my day job so I know it works. I have a git repository that is updated via cvsimport from the central CVS, with patches of mine managed by StGIT and git. I export what's applicable with format-patch, go to a CVS working tree next door and run git-apply there, and then manually commit the result into CVS. In other words, I am doing what cvsexportcommit ought to be doing by hand.

Show 5 quoted lines

>> I know this script originally came from southern hemisphere, but
>> I was talking about _western_ hemisphere.  The comment refers to
>> the part of the code the attached patch fixes, which I will
>> apply along with your updated patch.
> Western/nothern, both apply to where I live.

Yes, I noticed that you are east of Greenwich, and NZ is too.