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

Re: Patch for diff (was Re: Merger not Merging -- What I would like a merge process to do.)

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-01-25 16:35:41 CET

On Jan 24, 2005, at 2:20 PM, matthew ford wrote:

>>>
>>> p.s. Could you add patch to svn for completeness as it is needed for
>>> applying diffs
>>> and does not come standard on Windows.
>>>
>>
>> Why would you need to run the 'patch' program to use Subversion on
>> windows?
>>
> So I can diff and patch as oppossed to using merge as outlined in the
> docs.

The docs don't encourage the use of diff and patch. In fact, they
explain why you *wouldn't* want to use diff and patch, why 'svn merge'
is superior!

> It would have been usefull in sorting out my previous problems to see
> the
> diff file and then the resulting patch and compare them to the merge
> result.
>

I don't understand. Maybe you can explain more. What do you mean by
comparing the "diff file" and "the resulting patch"? Aren't those the
same thing?

> As I say patch is for completeness, I assume you will need to supply
> patch
> when you produce your enhanced diff so why not put the standard one in
> now
> to match the standard diff supplied.

Agreed. If, someday, 'svn diff' learns to produce an "enhanced diff"
format, then we will probably need an 'svn patch' subcommand to read
the format.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jan 25 16:43:25 2005

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