[prev in list] [next in list] [prev in thread] [next in thread]
List: cfe-dev
Subject: [cfe-dev] Resolving conflicts when using arcanist
From: Nathan Wilson <nwilson20 () gmail ! com>
Date: 2015-07-31 21:20:17
Message-ID: CAMDJ-qY=DQudYE-hFJfrPFBBb-uZknHDROFUfiVxB1NCV9APkQ () mail ! gmail ! com
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
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
[Attachment #5 (text/html)]
<div dir="ltr"><div><div><div><div>Hi,<br><br></div>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?<br><br>arc patch D11600<br>patching file \
test/SemaCXX/cxx-concept-declaration.cpp<br>Hunk #1 FAILED at 15.<br>1 out of 1 hunk \
FAILED -- saving rejects to file \
test/SemaCXX/cxx-concept-declaration.cpp.rej<br>patching file \
lib/Sema/SemaDecl.cpp<br>Hunk #1 succeeded at 5855 (offset 6 lines).<br><br> 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.<br><br></div>I'd appreciate any \
help.<br><br></div>Thanks,<br></div>Nate<br></div>
_______________________________________________
cfe-dev mailing list
cfe-dev@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-dev
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic