Displaying 2 results from an estimated 2 matches for "b633f542".
2018 Apr 25
0
Merging problem
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
2018 Apr 25
2
Merging problem
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.
#