RE: [TSVN] Re: TortoiseMerge: Editing conflicts

SteveKing wrote:
> Hughes, Bill wrote:
> [snip]
>> winmerge lets you edit the file (a bit) while merging two files. I
>> seem to remember that winmerge is going to go three way, if it
>> hasn't already. I downloaded the source code to these with an eye to
>> sticking my favourite bits together but it's in my pending tray with
>> hundreds of other useful bits I don't have time for.
>
> I think if you don't write the three way part for WinMerge yourself
> and send them your patch this won't happen anymore this decade.

You're probably right, and if I had the time I might get on with it :-(
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...
Not all of those features are particularly relevant for version control but
the more general purpose the better.

Oh, and as they're written with different toolkits I'd have a choice to make
there...
I'd prefer to end up with a multi-platform tool a la kdiff3 but then I'd
probably have to use either gtk or maybe wxwindows. Ho Hum.

I'd like a tsvn-a-like on linux too, but I really don't have the time or
skills to even contemplate that. I'm not Stefan after all :-)

NB none of the above is meant to be critical of TMerge or Stefan of course,
it's just what _I_ would like a merge tool to do, and as Stefan said TMerge
was written as a very nice extra to Tsvn - and it's starting to take on more
of a life of it's own.

Thanks again.
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