Re: [PATCH] mergetools/p4merge: Handle "/dev/null"

2012-12-19 Thread David Aguilar
On Sat, Oct 27, 2012 at 1:47 AM, Jeremy Morton wrote: > Sorry to be replying to this so late; I hadn't noticed the post until now! > > I've tried putting that code in my p4merge script and yes it does indeed > work fine. However, it puts a temporary file in the working directory which > I'm not s

Re: [PATCH] mergetools/p4merge: Handle "/dev/null"

2012-10-27 Thread Jeremy Morton
Sorry to be replying to this so late; I hadn't noticed the post until now! I've tried putting that code in my p4merge script and yes it does indeed work fine. However, it puts a temporary file in the working directory which I'm not sure is a good idea? If we look at this patch which actually

[PATCH] mergetools/p4merge: Handle "/dev/null"

2012-10-10 Thread David Aguilar
p4merge does not properly handle the case where "/dev/null" is passed as a filename. Workaround it by creating a temporary file for this purpose. Reported-by: Jeremy Morton Signed-off-by: David Aguilar --- Jeremy, can you test this? mergetools/p4merge | 25 + 1 file ch