<html><body><p><font size="2">Try using patch instead of git (due to fuzz)</font><br><br><font size="2"> $ patch -p1 < D77421.diff </font><br><font size="2">patching file llvm/lib/Transforms/IPO/WholeProgramDevirt.cpp</font><br><font size="2">Hunk #1 succeeded at 454 (offset -46 lines).</font><br><font size="2">Hunk #2 succeeded at 486 with fuzz 1 (offset -47 lines).</font><br><font size="2">Hunk #3 succeeded at 1278 (offset -142 lines).</font><br><font size="2">Hunk #4 succeeded at 1321 (offset -142 lines).</font><br><font size="2">patching file llvm/test/Transforms/WholeProgramDevirt/Inputs/unique-retval-same-vtable.yaml</font><br><font size="2">patching file llvm/test/Transforms/WholeProgramDevirt/import.ll</font><br><font size="2">patching file llvm/test/Transforms/WholeProgramDevirt/unique-retval-same-vtable.ll</font><br><font size="2">patching file llvm/test/Transforms/WholeProgramDevirt/unique-retval.ll</font><br><br><font size="2"><br>Best,<br><br>Jinsong Ji (¼Í½ðËÉ), PhD.<br><br>XL/LLVM on Power Compiler Development <br>E-mail: jji@us.ibm.com</font><br><br><img width="16" height="16" src="cid:1__=8FBB0FD6DFC3CE688f9e8a93df938690918c8FB@" border="0" alt="Inactive hide details for Alexandre Ganea via llvm-dev ---04/09/2020 10:30:26 AM---Hello, Is there a way for Phabricator to ret"><font size="2" color="#424282">Alexandre Ganea via llvm-dev ---04/09/2020 10:30:26 AM---Hello, Is there a way for Phabricator to retain the patches as originally uploaded?</font><br><br><font size="2" color="#5F5F5F">From: </font><font size="2">Alexandre Ganea via llvm-dev <llvm-dev@lists.llvm.org></font><br><font size="2" color="#5F5F5F">To: </font><font size="2">LLVM Dev <llvm-dev@lists.llvm.org>, MyDeveloper Day <mydeveloperday@gmail.com></font><br><font size="2" color="#5F5F5F">Date: </font><font size="2">04/09/2020 10:30 AM</font><br><font size="2" color="#5F5F5F">Subject: </font><font size="2">[EXTERNAL] [llvm-dev] Applying patches from Phabricator?</font><br><font size="2" color="#5F5F5F">Sent by: </font><font size="2">"llvm-dev" <llvm-dev-bounces@lists.llvm.org></font><br><hr width="100%" size="2" align="left" noshade style="color:#8091A5; "><br><br><br>Hello,<br> <br>Is there a way for Phabricator to retain the patches as originally uploaded?<br>When using the ¡°Download Raw Diff¡± button, it seems Phabricator reformats the patch, loosing the parent commit along the way, so often patches don¡¯t apply.<br> <br>The following works, because I¡¯ve got the latest checkout on master, and the patch was rebased recently:<br>
<ul><ul><font size="2" face="Courier New">F:\llvm-project>curl </font><a href="https://reviews.llvm.org/D77421?download=true"><u><font size="2" color="#0563C1" face="Courier New">https://reviews.llvm.org/D77421?download=true</font></u></a><font size="2" face="Courier New"> -L >patch.txt</font><br><font size="2" face="Courier New"> </font><br><font size="2" face="Courier New">F:\llvm-project>git apply -3 patch.txt</font></ul></ul> <br>But if I switch to the release branch and try to apply:<br>
<ul><ul><font size="2" face="Courier New">F:\llvm-project>git reset && git checkout .</font><br><font size="2" face="Courier New">(...)</font></ul></ul>
<ul><ul><font size="2" face="Courier New">F:\llvm-project>git checkout release/10.x</font><br><font size="2" face="Courier New">(...)</font></ul></ul>
<ul><ul><font size="2" face="Courier New">F:\llvm-project>git apply -3 patch.txt</font><br><font size="2" face="Courier New">error: patch failed: llvm/lib/Transforms/IPO/WholeProgramDevirt.cpp:529</font><br><font size="2" face="Courier New">error: repository lacks the necessary blob to fall back on 3-way merge.</font><br><font size="2" face="Courier New">error: llvm/lib/Transforms/IPO/WholeProgramDevirt.cpp: patch does not apply</font></ul></ul> <br>Is there some magic I¡¯m not aware of?<br> <br>Thanks!<br>Alex.<tt><font size="2">_______________________________________________<br>LLVM Developers mailing list<br>llvm-dev@lists.llvm.org<br></font></tt><tt><font size="2"><a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev</a></font></tt><tt><font size="2"> <br></font></tt><br><br><BR>
</body></html>