[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Improved patch format - SoC

From: Branko ─îibej <brane_at_xbc.nu>
Date: 2007-04-02 16:08:27 CEST

Peter Samuelson wrote:
> [Branko ??ibej]
>
>> No, diff looks at two files. plain 'svn diff" looks at the the file in
>> the working copy, and at what that file looked like when it was last
>> updated from the repository, e.g., it's most recent "ancestor".
>>
>> Merge, on the other hand, looks at three files: The file you're merging
>> from, the file you're merging to, and the common ancestor of these two
>> files. You could say that 'diff3 + patch == merge', but 'diff' and
>> 'diff3' don't produce the same results.
>>
>
> No, diff + patch _also_ looks at 3 files: diff looks at 2 files, and
> patch looks at a third file. The third file may be the same as the
> first file, similar to the 'merge -rHEAD:nnn filename' case.
>

Please see above. merge = diff3 + patch. diff3 != diff.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Apr 2 16:09:11 2007

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.