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.
hth,
Nick Stolwijk
~Java Developer~
Iprofs BV.
Claus Sluterweg 125
2012 WS Haarlem
www.iprofs.nl
On Thu, Dec 4, 2008 at 12:56 PM, Stefan Sperling <stsp_at_elego.de> wrote:
> On Thu, Dec 04, 2008 at 10:53:44AM +0100, Gunther Popp wrote:
>> Hi!
>>
>> It looks like the svn update command ignores the diff-cmd setting in the
>> Subversion config file. If I choose df to get the diff for a file in
>> conflict, I always receive the weired diff console output. If I execute
>> svn diff instead, my configured external diff tool is launched. IMO, the
>> df option of the update command should behave the same way like the
>> full-blown diff command.
>
> These two cases of diff are implemented separately.
>
> The diff code in interactive conflict resolution is quite simple.
> With a bit of work, it should be possible to make it use the full-blown
> diff code that 'svn diff' uses, with all bells and whistles.
> This implies adding a new diff-cmd option to 'svn update', and possibly
> more changes (i.e. it's not just gonna be a simple one-line change).
>
>> Is this considered a bug?
>
> I'd say you are requesting an enhancement, not reporting a bug.
> Nothing is broken, but the implemented functionality does not
> match what you'd like to have.
>
>> I couldn't find an issue for this and am thinking about creating a new one.
>> Any comments on this?
>
> Yes, feel free to file an issue.
>
> Stefan
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=979581
>
> To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
>
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=979592
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2008-12-04 13:38:48 CET