[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 14:49:14 CEST

SteveKing wrote:
> Hughes, Bill wrote:
>
>> Another irritation I have with TMerge is that I haven't worked out a
>> way of using it from the 'Send To' context menu. With other tools I
>> can select two or three files and use 'send to' and the tool
>> automatically runs a diff on the arguments supplied. Is there a way
>> of doing this with TMerge or does the code have to be change to
>> parse the input and use the supplies parameters as base, yours,
>> theirs automatically if the '/xxx=' is missing?
>
> Select two files, then in the TSVN submenu choose "diff".
Thanks, I should have spotted that, but I was mostly trying on non-versioned
files and it never occurred to me to look there, even more convenient than
'send to'.

> I don't know how this would work for three files, I mean how could you
> tell which of the three files is base, theirs and yours?
You can't. I suppose I'm trying to using TMerge as a general purpose tool,
so those labels don't have any meaning, I wanted to diff between three
files, but not in a version control context.

I do a lot of data manipulation and diff tools make testing easy.
Patch files are very useful, in one case I have to do a diff between two
sets of over a hundred files and make sure I haven't broken anything. Gnu
(e)diff is my friend here, but if there is a patch file of non-zero length I
want a gui to do the checking.
I'm probably a niche market I know but diff/merge tools are incredibly
useful to me generally.

Thanks for the help.
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 15:57:25 2004

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