[llvm-dev] Applying patches from Phabricator?

[Andrzej Warzynski via llvm-dev]

Hi Alex,

Have you tried using Arcanist?

https://llvm.org/docs/Phabricator.html#requesting-a-review-via-the-command-line

-Andrzej

On 09/04/2020 15:30, Alexandre Ganea via llvm-dev wrote:
> Hello,
> 
> Is there a way for Phabricator to retain the patches as originally uploaded?
> 
> 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.
> 
> The following works, because I�ve got the latest checkout on master, and 
> the patch was rebased recently:
> 
> F:\llvm-project>curl https://reviews.llvm.org/D77421?download=true -L 
>  >patch.txt
> 
> F:\llvm-project>git apply -3 patch.txt
> 
> But if I switch to the release branch and try to apply:
> 
> F:\llvm-project>git reset && git checkout .
> 
> (...)
> 
> F:\llvm-project>git checkout release/10.x
> 
> (...)
> 
> F:\llvm-project>git apply -3 patch.txt
> 
> error: patch failed: llvm/lib/Transforms/IPO/WholeProgramDevirt.cpp:529
> 
> error: repository lacks the necessary blob to fall back on 3-way merge.
> 
> error: llvm/lib/Transforms/IPO/WholeProgramDevirt.cpp: patch does not apply
> 
> Is there some magic I�m not aware of?
> 
> Thanks!
> 
> Alex.
> 
> 
> _______________________________________________
> LLVM Developers mailing list
> llvm-dev at lists.llvm.org
> https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev
>