Re: svn update ignores diff-cmd ?

On Thu, Dec 04, 2008 at 01:37:31PM +0100, Nick Stolwijk wrote:
> Again, and to the list:
>
> When you do an update, you have a three way comparison: old revision,
> new revision and working copy. For this you have to set the following
> option:
>
> diff3-cmd = #Your diff3 tool
>
> The svn help update also doesn't specify a diff-cmd option, it
> specifies the diff3-cmd option.

I don't think that is what Gunther was asking about.
The diff3 tool is used to merge a conflicted file.

What Gunther was asking about was the 'df' command during
interactive conflict resolution, which is used to display the
2-way diff between the base and the already merged file.

This currently always shows a unidiff on stdout, and there
is no way to make it run an external diff tool for display
instead.

Stefan

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=979595

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2008-12-04 13:51:04 CET