[ On Tuesday, February 26, 2002 at 00:27:36 (-0800), Paul Sander wrote: ]
> Subject: Re: CVS Update Behaviour
>
> Why bother with "patch" when "merge" is better? Or even better yet,
> "cvs update"?
You haven't been paying attention, have you. The answer to your
questions was what started this debate in the first place.
> Interesting, I just read the man page for patch again, and it
> doesn't mention diff3. According to this, all that "patch" does
> is it takes the difference between one file and another, applies
> the difference to a copy of the first file to produce a copy of
> the second file.
And what can produce a "difference between one file and another"? Why
'diff3' can! Oh! Wow! What revalation! (obviously it does a wee bit
more than that, but only slightly)
> This is a simple 2-way merge, which we all know is inferior to
> 3-way merges because they don't account for situations in which
> the delta is applied to something that isn't identical to the first
> file.
Hmmm.... so you really don't understand what 'diff3' does, eh? RTFM my
friend, and then play some games with it. Perhaps someday you'll see
the light.
--
Greg A. Woods
+1 416 218-0098; <[EMAIL PROTECTED]>; <[EMAIL PROTECTED]>; <[EMAIL PROTECTED]>
Planix, Inc. <[EMAIL PROTECTED]>; VE3TCP; Secrets of the Weird <[EMAIL PROTECTED]>
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
