RE: diff-iculties

[Andy Baker]

So, is that a yes or a no? '-) Should the effective end result be the same?
I think it should but I've found a situation where it's not and it's doing
my tiny mind in. The patch method works, but up -j -j (ie diff3) tries to
throw a large chunk of code in. I'm moving towards the situation where I do
both and compare the results, which is gross but safer.

The up -j -j merge is GNU diff3 anyway isn't? (with -am -E at least)

Yep, I have context diff on to generate the patch.

> >NOTICE AND DISCLAIMER:
> >This email (including attachments) is confidential.  If you have received
> Then why is it going to a public mailing list and Usenet newsgroup? :)
Cos I don't have any choice in the matter.
Nowt I can do about it unfortunately.


-----Original Message-----
From: address@hidden [mailto:address@hidden
Sent: 31 October 2001 20:08
To: address@hidden
Subject: Re: diff-iculties


In article <address@hidden>, Andy Baker wrote:
>I might be being more thick than usual today, 
>but shouldn't the following two examples 
>essentially produce the same result?...
>
>   cvs up -jrev1 -jrev2 file
>
>   cvs diff -rrev1 -rrev2 file >patch
>   patch file <patch

The patch program does not handle three-way merging. It tries to patch
the diff hunks into the source text; if it cannot figure out where a
hunk goes, it writes it into a .rej (reject) file. Unlike CVS, patch
doesn't have access to the ancestral version.

However, the CVS merge operation you are doing *is* quite similar to the
actions of the GNU diff3 utility (when that is invoked in a certain way).

Also note that you should make a context diff to maximize the chances
of patch working properly; if the file being patched is different from
the patch base, it needs the context lines to guess where the changes
need to be applied.

>NOTICE AND DISCLAIMER:
>This email (including attachments) is confidential.  If you have received

Then why is it going to a public mailing list and Usenet newsgroup? :)
_______________________________________________
Info-cvs mailing list
address@hidden
http://mail.gnu.org/mailman/listinfo/info-cvs



NOTICE AND DISCLAIMER:
This email (including attachments) is confidential.  If you have received
this email in error please notify the sender immediately and delete this
email from your system without copying or disseminating it or placing any
reliance upon its contents.  We cannot accept liability for any breaches of
confidence arising through use of email.  Any opinions expressed in this
email (including attachments) are those of the author and do not necessarily
reflect our opinions.  We will not accept responsibility for any commitments
made by our employees outside the scope of our business.  We do not warrant
the accuracy or completeness of such information.