[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Feature request: Allow to open Diff Base:Mine and Base:Theirs from conflict resolution

From: Stefan Hett <stefan_at_egosoft.com>
Date: Mon, 21 Aug 2017 19:55:47 +0200

On 7/3/2017 9:38 PM, Stefan Küng wrote:
> On 03.07.2017 10:58, Sven Strickroth wrote:
>> Hi,
>>
>> sometimes the 3-way-diff mode is quite complex and not easy to read.
>>
>> What about adding an option to open the Base:Mine and Base:Theirs diffs separately (e.g., by opening the context menu on the header bar).
> Not sure what you mean here:
> Am I understanding this correctly that you want a button/menu-entry to
> open a separate TMerge instance which would then show the diff between
> base/min or base/theirs?
> You're aware that editing would have to be blocked in those instances?
> Or how would you use edits in those instances?
> Not sure how this would work...
>
> Stefan
>
I can see that this can help in my workflow here as well (assuming that
by Base:Mine the OP actually refers to the state of the file before the
revision which is being merged, rather than the current WC state or WC
base state). Still, I'm not going to second a change in this regards.

Just for explanation:

When it's hard for me to read and work with the TMerge dialog to resolve
a conflict (for instance because the code I want to merge the changes to
did undergo some major refactoring), I open up the log dialog of the
branch I merged, select the revision and then double-click the file
which I ended up with the text conflict in the first place. This then
opens WinMerge for me (since I set that in the TSVN settings) which
provides me with an intuitive display of which changes were done in that
revision.

I then open the conflicting file in the normal editor (i.e. VS), revert
all changes and manually apply the changes I see in the WinMerge dialog.

I assume the OP is following a similar workflow and would like to save
the step of having to go through the log dialog manually to be presented
with what changed in the revision which caused the merge conflict.

I'm simply not seconding his request here, since I think this is quite
an edge case to cover (the majority of cases are handled fine with
TMerge's 3-way-diff-display). Furthermore, getting the diff-display can
be achieved already as described above. I'm not convinced that any
integration of such a shortcut-option in the TMerge tool would be
intuitive to locate/find/use...

-- 
Regards,
Stefan Hett
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3291182
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2017-08-21 22:09:29 CEST

This is an archived mail posted to the TortoiseSVN Dev mailing list.