On Wednesday, April 9, 2003, at 08:26 PM, Tom Lord wrote:
>
>
> I have to be careful then. After experiencing third-party
> source maintenance with CVS, it looks like I trust version
> control systems too much. CVS 1.11.5 that I use doesn't work
> this way, it surely generates a conflict on merge. Will
> Subversion generate a conflict if the external diff is used? I
> really hope to hear "yes".
>
> I'll speak out of turn here and give the answer as I understand it:
> "Yes". (A core developer can correct me if I'm wrong.) I'm not too
> clear on when or whether external vs. internal diff is used --- just
> that I asked and got the answer that svn does not currently use v.a.p.
our internal diff code is currently used by default. you can override
it on the command line or via a config file option. this is not v.a.p.
though. we do have an implementation of v. a. p. in the tree, but it
is not well tested, and the command line client does not use it yet
(and as far as i know there has not yet been any discussion of the best
way to work it into the interface).
-garrett
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Apr 10 02:23:42 2003