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>
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 On Wed, Apr 25, 2018 at 10:29 AM, Dávid Bolvanský via llvm-dev <llvm-dev at lists.llvm.org> wrote:> 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? > > _______________________________________________ > LLVM Developers mailing list > llvm-dev at lists.llvm.org > http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev >
Thanks, arc solved it :) 2018-04-25 20:21 GMT+02:00 Hans Wennborg <hans at chromium.org>:> 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 > > On Wed, Apr 25, 2018 at 10:29 AM, Dávid Bolvanský via llvm-dev > <llvm-dev at lists.llvm.org> wrote: > > 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? > > > > _______________________________________________ > > LLVM Developers mailing list > > llvm-dev at lists.llvm.org > > http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev > > >-------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.llvm.org/pipermail/llvm-dev/attachments/20180425/b633f542/attachment.html>