I started a long reply to Stefan^2 yesterday, but was unable to send it
due to electricity blackout (sadly, this is still common in Russia).
In the meantime, Stefan^1 already said most of what I wanted to say. :-)
On 10/9/07, Stefan.Fuhrmann@etas.de <Stefan.Fuhrmann@etas.de> wrote:
> My question: Is this still true or do we plan to make TortoiseMerge
> a full-blown bells-and-whistles merge tool?
Why not? It is certainly not a weak one already, and it is fun to work in it.
On 10/10/07, Stefan Küng <tortoisesvn@gmail.com> wrote:
> What features do you think are missing?
I think that the biggest missing feature is movement detection.
And I have plans to implement it, I shall post them in a few days.
> > * 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.
I disagree here.
TMerge can be easily started this way -- just select two folders in explorer,
and choose 'SVN Diff' from context menu.
It even errors out with 'TortoiseMerge can't diff directories.'
So I would say it is a missing feature, but not an important one, for
me at least.
> > - 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.
I think Stefan^2 talks about movement detection here, not whitespace comparison.
As I wrote above, this is indeed important missing feature,
but I would say that the implementation described by Stefan^2 is suboptimal --
we can do better than this.
> > * Araxis Merge for merges
> > - great auto-merge (many conflicts are just resolved "the right way")
Interesting. Have you any idea about the algorithms involved?
> 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.
I agree that this is desirable.
> 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
How about contrib\ext_diff_examples.txt file, documenting the commands
to invoke various external tools, with a clear text stating those are
just examples and require modification according to user's local configuration?
This way the only users affected will be those ones who actually do read
documentation and make an effort to manually copy-and-paste examples.
Hopefully, we will thus avoid the silliest complaints.
--
Alexander S. Klenin
Insight Experts Ltd.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Oct 10 04:24:42 2007