[llvm-dev] Merging problem

Dávid Bolvanský via llvm-dev llvm-dev at lists.llvm.org
Wed Apr 25 10:29:47 PDT 2018


Hello,

I merged my test commit successfully. (./utils/release/merge.sh --proj llvm
--rev 46043 -srcdir ../llvm/) ... D46043 as "Merging r46043"

https://reviews.llvm.org/rL330799

But I have issues with other patch - https://reviews.llvm.org/D45418

I ran
./utils/release/merge.sh --proj llvm --rev 45418 -srcdir ../llvm/

# Updating tree
Updating '.':
At revision 330799.
# Merging r45418 into llvm locally
--- Merging (from foreign repository) r45418 into '.':
   C lib/Archive
   C lib/Analysis/ProfileInfoLoader.cpp
...

It seems It tries to download the r45418 which is wrong, that is not mine.
Any advice?
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-dev/attachments/20180425/0be811ca/attachment.html>


More information about the llvm-dev mailing list