(TSVN 1.10) Incorrect left/right/center names for invoked 3rd-party merge tools
Stefan Hett
Hi,
upon editing a text conflict, my 3rd-party editor is invoked (SourceGear DiffMerge).
It seems that the displayed titles are somehow wrong:
i.e.:
left: Remote file
center: Working Copy
right: Working Copy
Note that in TSVN 1.9 it used to be:
left: Working Copy
center: Working Base
right: Remote file
From the file content in TSVN 1.10 it still seems to be that way (i.e. only the titles seem to be off).
The Merge Tool setting in the TSVN config dialog is set to: [...]DiffMerge\sgdm.exe -nosplash -m -r=%merged -t1=%yname -t2=%bname -t3=%tname -c=%mname %mine %base %theirs
This was left unchanged from TSVN 1.9. t1 is the left title, t2
the center one, t3 the right one.
Based on the current TSVN still suggests that %tname is the title
for the file in the repository --- hence I'd assume that this
should still resolve to "adjacentroomscanner.h: Remote file". Or
am I missing something?
-- Regards, Stefan Hett, Developer/Administrator
alon...@gmail.com
Caused me to lose a days worth of merging work for my whole team
> Hi,
>
> upon editing a text conflict, my 3rd-party editor is invoked
> (SourceGear DiffMerge).
>
> It seems that the displayed titles are somehow wrong:
>
>
>
alon...@gmail.com
Unfortunately I only noticed this at the end of the day after a full day of merging for my whole team...
So now I have to revert all my merges and start over :(
Hopefully this will be fixed soon :)
On Friday, 20 April 2018 16:22:33 UTC+3, Stefan_Ego wrote:
>
> upon editing a text conflict, my 3rd-party editor is invoked
> (SourceGear DiffMerge).
>
> It seems that the displayed titles are somehow wrong:
>
>
>
alon...@gmail.com
Caused me to lose a days worth of merging work for my whole team
>
> upon editing a text conflict, my 3rd-party editor is invoked
> (SourceGear DiffMerge).
>
> It seems that the displayed titles are somehow wrong:
>
>
>
Stefan
Stefan