Re: [galaxy-dev] Merging files: Error merging filesglobal name 'shutil' is not defined

2013-04-25 Thread Dannon Baker
Hey Peter, Thanks for the contributions, I've committed the changes to -central. You're definitely right about the merge failure not setting the job status to error, and I'm looking into that now. -Dannon On Thu, Apr 25, 2013 at 6:51 AM, Peter Cock p.j.a.c...@googlemail.comwrote: Hi all,

Re: [galaxy-dev] Merging files: Error merging filesglobal name 'shutil' is not defined

2013-04-25 Thread Peter Cock
On Thu, Apr 25, 2013 at 1:40 PM, Dannon Baker dannon.ba...@gmail.com wrote: Hey Peter, Thanks for the contributions, I've committed the changes to -central. You're definitely right about the merge failure not setting the job status to error, and I'm looking into that now. -Dannon Thanks -