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

Re: svn diff uses internal diff!, WAS: RE: Diff plugins

From: Greg Stein <gstein_at_lyra.org>
Date: 2003-02-16 22:58:34 CET

On Sun, Feb 16, 2003 at 11:24:26AM +0100, Sander Striker wrote:
> > From: Greg Stein [mailto:gstein@lyra.org]
> > Sent: Sunday, February 16, 2003 6:12 AM
>
> > On Sat, Feb 15, 2003 at 01:46:26AM +0100, Sander Striker wrote:
> >>...
> >> Ok, we can get rid of diff-cmd and SVN_CLIENT_DIFF right now. The diff3
> >> stuff is a bit different. I haven't merged over the internal merge code
> >> yet because there is no opt out (yet). I'm guessing we will need a
> >> merge-cmd option (and we will need a merge_fn once we move to the provider
> >> scheme). Anyway, thoughts on whether we should move to internal or hold
> >> off on it until we have an opt-out?
> >
> > Switch it. The opt-out isn't required; we're only asking for it for safety's
> > sake. Worst case, somebody can always get the two files and diff them.
>
> I don't think you are seeing the big picture here. Merging could, next to
> 'merge', happen on 'update' and 'switch'. Then it operates on local mods
> that aren't backed up...

Then why'd you ask if you aren't even comfortable switching it? :-)

Cheers,
-g

-- 
Greg Stein, http://www.lyra.org/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Feb 16 22:54:49 2003

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