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

Re: [OT] Conflict, an open source project

From: Daniel Rall <dlr_at_finemaltcoding.com>
Date: 2007-08-29 07:09:54 CEST

On Aug 2, 2007, at 2:30 AM, Charles Acknin wrote:
...
> On 8/2/07, Dennis Byrne <dennisbyrne@apache.org> wrote:
...
>> One question, is the svn diff output *identical* to cvs diff
>> output? If so,
>> Conflict could be used with both.
>
> I can't guaranty it is 100% identical, but I'm sure there are lots of
> folks on this list who have this answer. However, svn diff is using
> Unidiff and so is cvs.

The diff output is not identical, but it close. Both can be fed to
'patch'. 'cvs diff' requires the
'-u' option to go into unidiff format, while unidiff is the default
for Subversion's built-in diff.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Aug 29 07:00:36 2007

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