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

Re: [PATCH] Pass the name of the conflicted file to the merge tool

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: Tue, 13 Jan 2009 10:09:29 -0500

Julian Foad wrote:
>> The existing code currently uses "-L" switches to pass labels into the
>> external diff3 and external diff tools. I don't think those labels have
>> relative path information, but I doubt we really want them to.
>
> I see C-Mike Pilato made an improvement yesterday to put make the
> temporary file names reflect the real file name, so hopefully that's
> made the situation better. I haven't looked at it yet.

I just tested this, and I think the change I made yesterday *does* help
this. I tested the (l)aunch option just now with Emacs as the "tool", and I
got a filename like <name-of-file>.tmp in Emacs. Is that the kind of
improvement folks were looking for?

-- 
C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1022066

Received on 2009-01-13 16:09:52 CET

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