[lldb-dev] buildbot failure in LLVM on lldb-x86_64-linux

[Charles Davis]

I'd like to fix this, but for some reason, I can't commit to LLDB right now:

Merge conflict during commit: File or directory 'source/Interpreter/OptionValueFileSpec.cpp' is out of date; try updating: resource out of date; try updating at /usr/libexec/git-core/git-svn line 595

Can someone commit this patch for me? Thanks.

Chip
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Core-Fix-non-Darwin-build.patch
Type: application/octet-stream
Size: 712 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-dev/attachments/20130826/3d9295b3/attachment.obj>
-------------- next part --------------


On Aug 26, 2013, at 11:37 PM, llvm.buildmaster at lab.llvm.org wrote:

> The Buildbot has detected a new failure on builder lldb-x86_64-linux while building cfe.
> Full details are available at:
> http://lab.llvm.org:8011/builders/lldb-x86_64-linux/builds/6340
> 
> Buildbot URL: http://lab.llvm.org:8011/
> 
> Buildslave for this Build: gcc20
> 
> Build Reason: scheduler
> Build Source Stamp: [branch trunk] 189317
> Blamelist: cdavis,jmolenda,mgottesman
> 
> BUILD FAILED: failed compile
> 
> sincerely,
> -The Buildbot
> 
> 
>