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

[TSVN] Re: Re: TortoiseMerge: Editing conflicts

From: Simon Large <slarge_at_blazepoint.co.uk>
Date: 2004-09-27 12:26:36 CEST

Hughes, Bill wrote:
> I'd like to start with TMerge and add the editing and folder diffing from
> winmerge and the character level change highlighting from kdiff3 (and the
> ability to choose in which of the three files the merge is resolved). Then
> wait for the enhancement requests...

I'll add my two penn'orth (for non UK residents, that's pennies-worth :-)

First of all I really like TMerge. OK, there are other features it could
have, but that would be a distraction from the main app. What it does, it
does well. There are minor tweaks which have already been discussed, but it
is a good tool, and for unified-diff handling, a unique good tool.

My big concern is that once you start adding editing features, you increase
the complexity by a considerable amount, and you also take on much more
responsibility for user's data. Rule #1 is that you never ever munge the
user's data. Adding an editor is no trivial task, and it is a task which you
cannot afford to get even a little bit wrong.

And again, once you add an editor, you open yourself up to all sorts of
requests for editor features which have nothing to do with version control.
This really could turn into a major project in its own right!

My inclination would be to take a spec to an existing editor/compare tool
writer and see if they are interested in adding merge functionality.
UltraEdit comes to mind, but then that would be shareware rather than open
source, and it would be Windows-only, not multi-platform.


To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Sep 27 13:56:56 2004

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