> From: Tom Lord [mailto:lord@emf.net]
> Sent: Thursday, April 10, 2003 2:19 AM
[...]
> All that said: I'd surely like a stand-alone diff4 and even a built-in
> diff4 (that emits a patch set rather than munging my tree) as a tool
> to have around -- it's just a bloody mess, though to apply diff4
> patches blindly as a day-to-day merging technique. My (possibly
> faulty) understanding from off-list conversations was that blindly
> applying diff4 was begining to be thought of as a way around the "back
> and forth" merging problem.
I am going to propose that in a few days time yes. Possibly with options
to mark adjustments as conflicts. This would be the same as someone
requested for our internal diff3, always mark all changes as conflicts
(even when they don't conflict). Every user can decide for themselves
what their default is going to be. At installation we will set it to
the 'safest' value.
Anyway, the proposal isn't even out yet because I simply don't have the
time to catch up right now :(.
Sander
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Apr 10 09:16:01 2003