[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.Fuhrmann_at_etas.de>
Date: 2007-10-09 14:27:49 CEST

Stefan Küng <tortoisesvn@gmail.com> wrote 06.10.2007 15:12:22:

> > (1) Simplify diff & merge tool config:
> >
> > * TSVN should scan the registry for installed diff
> > and merge tools (parameter file(s) or two hard-coded
> > lists).
> > * TSVN should know about the parameters to be passed
> > to these tools
> > * TSVN should list the tools found in a drop-down box.
> > So you can use either browse or select from list.
> > In any case, the user can modify the edit box content.
> > * TSVN should preselect one of them (e.g. according
> > to a hard-coded preference list), if there isn't
> > already a user setting.
> >
> > * Scanning should be an optional part of the installation.
> >
> > * Manual scan should be possible from the settings dialog.
> >
> > 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.

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

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

> 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)
  - line-by-line comparision (e.g. the two "current" lines
    are shown on top of each other)
  - can select arbitrary lines to start the comparision from
    (e.g. if a block got moved, I can still check that it had
     not been touched)
  - 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)

* 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)
  - full-screen editors
  - character and line deletion markers (where chars
    have been removed from an otherwise unchanged line)
* what I miss: KDE Kompare-like patch / diff viewing

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 sience
because the only variable is the file path. The only
thing one has to do is to scan the registry under:


Again, I remember posts on this list from users that
had trouble configuring their tools.

A lot of text for a small, low-prio feature ;)
I think it would be just nice to have it.

-- Stefan^2.

To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Oct 9 14:28:27 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.