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

RE: [TSVN] Re: Re: TortoiseMerge: Editing conflicts

From: Hughes, Bill <Bill.Hughes_at_cox.co.uk>
Date: 2004-09-27 13:49:11 CEST

Simon Large wrote:
> 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.
I like TMerge too, but...

> 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.
You can't be much more responsible for the data if you're already doing
automatic merges.
I don't think there's a lot of difference between an editor or a merge tool
in terms of it being something that has to be working properly.

 
> 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.
Understood, that what I meant about waiting for enhancement requests :-(
I really only mean the sort of ability that winmerge provides, which isn't
much but normally just enough for me to do what I need. If someone
needed/wanted to they can fork it they way they want.
IMHO a little editing ability is a good thing but if you need something
complicated you should get out of the diff tool to do it, others will
disagree.

> This really could turn into a major project in its own right!
Maybe not a bad thing, but then that's the nature of free software - if it
doesn't do what we want, we change it or make one that does.

 
> 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.
Emacs comes to my mind - it seems to do everything already to some extent.
The other editor I use is t.h.e. (The Hessling Editor) which is based on the
IBM Xedit editor (no relation to unix xedit). Similar to Kedit if anyone
knows that but better. THE may be a better tools as it's nearly as
extensible as emacs but being line based it may fit better with the
diff/merge requirement. Hmm, if I could only find some time and could
compile this stuff. As Stefan suggested patching winmerge may be my best bet
:-(

Bill

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
This e-mail transmission is strictly confidential and intended solely
for the person or organisation to whom it is addressed. It may contain
privileged and confidential information and if you are not the intended
recipient, you must not copy, distribute or take any action in reliance
on it. If you have received this email in error, please reply to the
sender as soon as possible and delete the message. Please note that we
are able to, and reserve the right to, monitor e-mail communications
passing through our network.
The views expressed in this email are not that of the company unless
specified within the message.
The inclusion of this footnote indicates that the mail message and any
attachments have been checked for the presence of known viruses.
If you have any comments regarding our policy please direct them to
postmaster@cox.co.uk
________________________________________________________________________
This email has been scanned for all viruses by the MessageLabs Email
Security System. For more information on a proactive email security
service working around the clock, around the globe, visit
http://www.messagelabs.com
________________________________________________________________________
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Sep 27 14:57:19 2004

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