Re: [PATCH] mergetool: add an option for writing to a temporary directory

From: Robin Rosenberg <robin.rosenberg.lists@dewire.com>
Date: Oct 15, 2014, 19:30 UTC
Message-ID: <293924028.621540.1413401411270.JavaMail.zimbra@dewire.com>
In-Reply-To: <20141015063848.GC14751@gmail.com>

----- Ursprungligt meddelande -----

Show 23 quoted lines

> Från: "David Aguilar" <davvid@gmail.com>
> Till: "Junio C Hamano" <gitster@pobox.com>
> Kopia: "Robin Rosenberg" <robin.rosenberg@dewire.com>, git@vger.kernel.org, "Charles Bailey" <charles@hashpling.org>
> Skickat: onsdag, 15 okt 2014 8:38:49
> Ämne: Re: [PATCH] mergetool: add an option for writing to a temporary directory
> 
> On Mon, Oct 13, 2014 at 12:24:41PM -0700, Junio C Hamano wrote:
> > David Aguilar <davvid@gmail.com> writes:
> > 
> > > Teach mergetool to write files in a temporary directory when
> > > 'mergetool.writeToTemp' is true.
> > >
> > > This is helpful for tools such as Eclipse which cannot cope with
> > > multiple copies of the same file in the worktree.
> > 
> > With this can we drop the "change the temporary file name" patch by
> > Robin Rosenberg?
> > 
> > http://thread.gmane.org/gmane.comp.version-control.git/255457/focus=255599
> > 
> > Message-Id: <1408607240-11369-1-git-send-email-robin.rosenberg@dewire.com>
> 
> I would think so but I'm biased ;-)

The new patch solves my problem.

-- robin