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

Re: Feature request "Shift compare"

From: Stefan Kng <tortoisesvn_at_gmail.com>
Date: 2007-10-09 18:45:54 CEST

Stefan.Fuhrmann@etas.de wrote:
[snip]
>>> Benefit: TSVN would automatically interface with the
>>> "best" tool available on the user-machine.
>> That's easy and already done:
>> We all know that TortoiseMerge is the best diff tool available on the
>> user machine. :)
>>
>> Seriously: If we wouldn't provide our own diff tool, I would consider
>> such a feature. But we ship (and work heavily on) a diff tool.
>
> Well, my understanding was that our merge and diff tool(s)
> are mere "me too" implementations (No offense ment!). Just
> in case, the user did not bother to chose another tool.

Not really. I started TortoiseMerge because no other tool available
(free or commercial) couldn't apply patchfiles (apart from the command
line tool). Also, the only tool capable of doing three way merges at
that time was unusable slow.
So it's not a 'me too' implementation: it's a necessity.

I waited a long time for WinMerge to implement those missing features,
but the corresponding issues in their issuetracker have been open for
years - so I finally had enough and wrote TortoiseMerge.

> I'm pretty sure there have been posts on this list that
> follow the line of "no full-blown merge & edit tool".

TortoiseMerge is a full merge and edit tool.

> My question: Is this still true or do we plan to make TortoiseMerge
> a full-blown bells-and-whistles merge tool?

What features do you think are missing?

>> And since I don't like the idea of using some other diff tool with TSVN
>> because then we would get bug reports for those too, I have to object
>> against this.
>>
>> So: -1 from me.
>
> I think what happend is that my initial proposal was too
> detailed and lead you to belief that I wanted something
> entirely different from what we have now. This is not the
> case and I will try to explain based on my personal issue
> with the tools setting.
>
> Today, I use different tools with different strengths:
>
> * BeyondCompare for diffs
> - great folder tree scanning, filtering, comparison, sync.
> (not used by TSVN but the reason I have that tool at all)

TSVN doesn't need that. And there's no way to start a diff tool with
folders as parameters.

> - line-by-line comparison (e.g. the two "current" lines
> are shown on top of each other)

TortoiseMerge can do that too.

> - can select arbitrary lines to start the comparison from
> (e.g. if a block got moved, I can still check that it had
> not been touched)

TortoiseMerge shows a white dot on the left margin for lines that have
only whitespace changes.

> - weak when content has actually to be modified not just
> be copied around (select line to edit, go to the bottom
> of the window, edit the line, and so on)

TortoiseMerge allows you to edit the file in the right view, without
selecting the line and then go to another window for editing: you edit
'in place'.

> * Araxis Merge for merges
> - three-way folder-sync etc.
> - great auto-merge
> (many conflicts are just resolved "the right way")
> - "use both" feature (add additions from both sides)

'use mine before theirs' and 'use theirs before mine' in TMerge.

> - full-screen editors
> - character and line deletion markers (where chars
> have been removed from an otherwise unchanged line)

That's called inline diff in TortoiseMerge.

> * what I miss: KDE Kompare-like patch / diff viewing

Screenshot please? I don't know this feature.

> Since I use these tools anyway, I want TSVN to call them for
> diffs and merges. Today, I have to manually type stuff like
>
> C:\Program Files\Beyond Compare 2\BC2.exe %base %mine
>
> C:\Program Files\Araxis\Araxis Merge v6.5\Compare.exe
> /max /wait /3 /title1:%tname /title2:%bname /title3:%yname
> %theirs %base %mine %merged /a2
>
> Auto-configure during TSVN install may be over the top.
> So, what I would love was a button that fills the edit
> box for me, iff I want it to. This is no rocket science
> because the only variable is the file path. The only

Not really: each of those tools use different params for file1/2/3 and
the view titles (if they even have those). And what about the other
params you can specify (in your example: /max /wait /3 /a2) - if we
really have to do this, we'd also have to provide a config dialog for
each of those tools to pass the correct params.

> thing one has to do is to scan the registry under:
>
> HKEY_CURRENT_USER\Software\Microsoft\Windows\ShellNoRoam\MUICache
>
> Again, I remember posts on this list from users that
> had trouble configuring their tools.

I think those who have trouble configuring their custom diff/merge tools
should use TortoiseMerge instead. If they can't configure their tools,
then they will also have troubles using those tools correctly together
with TSVN.

I wouldn't mind to have TSVN allow the user to choose between two (or
maybe three, but not more) diff/merge tools from the context menu. But
configuring is up to the user. Because if we try to do that
automatically, we invite big trouble:
* users complaining about us missing their favorite tool
* different versions of the tools using different params
* tools configured wrong which makes them not show everything without
the user knowing
...

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Oct 9 19:01:57 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.