[cfe-dev] Resolving conflicts when using arcanist

[Nathan Wilson]

Hi,

When trying to apply a patch via arc (arc patch D<Revision>), I get a
conflict. So, it looks like the output below. Is there a good way of
resolving it? Should I just modify the the file that has an issue by adding
what was approved in the Patch, run the tests, then do an arc commit?

arc patch D11600
patching file test/SemaCXX/cxx-concept-declaration.cpp
Hunk #1 FAILED at 15.
1 out of 1 hunk FAILED -- saving rejects to file
test/SemaCXX/cxx-concept-declaration.cpp.rej
patching file lib/Sema/SemaDecl.cpp
Hunk #1 succeeded at 5855 (offset 6 lines).

 WARNING  Some hunks could not be applied cleanly by the unix 'patch'
utility. Your working copy may be different from the revision's base, or
you may be in the wrong subdirectory. You can export the raw patch file
using 'arc export --unified', and then try to apply it by fiddling with
options to 'patch' (particularly, -p), or manually. The output above, from
'patch', may be helpful in figuring out what went wrong.

I'd appreciate any help.

Thanks,
Nate
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-dev/attachments/20150731/4417619a/attachment.html>