You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Gunther Popp <sv...@guntherpopp.de> on 2008/12/04 09:53:44 UTC
svn update ignores diff-cmd ?
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.
Is this considered a bug? I couldn't find an issue for this and am
thinking about creating a new one.
Any comments on this?
Thanks,
Gunther
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=979564
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: svn update ignores diff-cmd ?
Posted by Stefan Sperling <st...@elego.de>.
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@subversion.tigris.org].
Re: svn update ignores diff-cmd ?
Posted by Gunther Popp <sv...@guntherpopp.de>.
Yes, that´s correct, but the diff3 is used to actually _detect_ the
conflicts. That is, the diff3 is executed before the available options
per file in conflict are displayed (e.g. e, df, mf, etc). What I´m
looking for is the output generated by the df option. In this case a
"normal" diff is executed, but obviously in some different way from the
full-blown diff-command.
I will file an enhancement request for this one, it's actually just a
convenience issue.
Cu,
Gunther
Nick Stolwijk schrieb:
> 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 <st...@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@subversion.tigris.org].
>>
>>
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=979592
>
> To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
>
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=979593
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: svn update ignores diff-cmd ?
Posted by Nick Stolwijk <ni...@gmail.com>.
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 <st...@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@subversion.tigris.org].
>
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=979592
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: svn update ignores diff-cmd ?
Posted by Stefan Sperling <st...@elego.de>.
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@subversion.tigris.org].