Re: Patchdiff
- From
Bert Wesarg <bert.wesarg@googlemail.com>
- Date
- Jan 27, 2010, 07:06 UTC
- Message-ID
- <36ca99e91001262306l58234073v83ce709bee6c54a0@mail.gmail.com>
- In-Reply-To
- <7vzl40wcz2.fsf@alter.siamese.dyndns.org>
On Wed, Jan 27, 2010 at 02:30, Junio C Hamano <gitster@pobox.com> wrote:
Show 16 quoted lines
> Nicolas Pitre <nico@fluxnic.net> writes: > >>> Do we have anything that allows me to compare two versions of a patch? >>> In theory it'd do something like "apply both patches to the their >>> merge base, then show the diff between the results". I don't think we >>> have something like that, since there's probably some major caveats >>> about conflicts when applying the patches to their merge-base. Or >>> perhaps my theory is silly, and there's an easier way to compare two >>> patches (other than looking at a diff's diff, which I've never been >>> good at). >> >> What about Git's diff -c/--cc ? You'd have to reverse the parenthood >> logic though. > > When I did "diff --cc" originally, I thought about its interaction with > reverse (-R), and gave up.
Actually, I have done this. My intention is to use this as a new merge conflict style.
I will send the patch, but not today.
Regards, Bert