Merging problem

Project Infrastructure LLVM Dev List Archives
1

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?

2

The merge.sh script is used to merge SVN commits to the release branch.

It sounds like what you want to do is commit patches from Phabricator
to trunk? If that's the case, see
https://llvm.org/docs/Phabricator.html#committing-a-change

3

Thanks, arc solved it :slight_smile: