On Tue, 2009-01-13 at 10:09 -0500, C. Michael Pilato wrote:
> 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?
Mike, that's great.
There may be an unintended change though: I noticed that the working
file is now left as a zero-bytes file if the diff3 tool doesn't save a
result file [1] and then you choose "postpone" at the prompt. :-(
[1] (Maybe it's supposed to? mine's kdiff3 and doesn't if I quit it
without saving.)
- Julian
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1022247
Received on 2009-01-13 17:39:44 CET