Resolving conflicts when using arcanist

Clang Frontend
1

Hi,

When trying to apply a patch via arc (arc patch D), 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

2

You’ll probably want to sync your working copy to the same revision from which D11600 was diffed-to and uploaded, then patch, then sync to head.

3

Hi Manuel,

Thanks! Looks like it works after merging with head. Now, when I go to commit, I get a warning message (below). Is that alright? Would it put any of the subversion history in a bad state or am I okay to commit?

Revision ‘D11600: [CONCEPTS] Add concept to VarDecl and diagnostic for
uninitialized variable concept’ was generated from ‘’, but current
working copy root is ‘/cfe/trunk’. Commit this revision anyway?

4

Hi Manuel,

Thanks! Looks like it works after merging with head. Now, when I go to commit, I get a warning message (below). Is that alright? Would it put any of the subversion history in a bad state or am I okay to commit?

Revision ‘D11600: [CONCEPTS] Add concept to VarDecl and diagnostic for
uninitialized variable concept’ was generated from ‘’, but current
working copy root is ‘/cfe/trunk’. Commit this revision anyway?

I’ve never seen this, and I have no idea what you’ve done.
You can always try submitting, look at what it did, and roll back if necessary.

5

Hi Manuel,

Thanks! Looks like it works after merging with head. Now, when I go to
commit, I get a warning message (below). Is that alright? Would it put any
of the subversion history in a bad state or am I okay to commit?

Revision 'D11600: [CONCEPTS] Add concept to VarDecl and diagnostic for
    uninitialized variable concept' was generated from '', but current
    working copy root is '/cfe/trunk'. Commit this revision anyway?

I've never seen this, and I have no idea what you've done.
You can always try submitting, look at what it did, and roll back if
necessary.

Good point. I'll do that then. Looks like I wasn't up to date with trunk,
so I'll give a try shortly.

Thanks for the help!