[llvm-dev] Merge script for Git monorepo?

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
6 messages Options
Reply | Threaded
Open this post in threaded view
|

[llvm-dev] Merge script for Git monorepo?

Doerfert, Johannes via llvm-dev

Now that we’re on the Git monorepo, is there an updated script for cherry-picking commits into the release branch? llvm/utils/release/merge.sh appears to still use SVN, and llvm/utils/release/merge-git.sh uses git-svn.


_______________________________________________
LLVM Developers mailing list
[hidden email]
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev
Reply | Threaded
Open this post in threaded view
|

Re: [llvm-dev] Merge script for Git monorepo?

Doerfert, Johannes via llvm-dev
Tom Stellard told me to use `git cherry-pick -x`, and if you look at the release branches, you can see it is used, although the old style is used as well. I'm not sure what script is being used there.

On Wed, Jan 15, 2020 at 4:54 PM Shoaib Meenai via llvm-dev <[hidden email]> wrote:

Now that we’re on the Git monorepo, is there an updated script for cherry-picking commits into the release branch? llvm/utils/release/merge.sh appears to still use SVN, and llvm/utils/release/merge-git.sh uses git-svn.

_______________________________________________
LLVM Developers mailing list
[hidden email]
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev

_______________________________________________
LLVM Developers mailing list
[hidden email]
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev
Reply | Threaded
Open this post in threaded view
|

Re: [llvm-dev] Merge script for Git monorepo?

Doerfert, Johannes via llvm-dev
On 01/15/2020 05:03 PM, Reid Kleckner via llvm-dev wrote:
> Tom Stellard told me to use `git cherry-pick -x`, and if you look at the release branches, you can see it is used, although the old style is used as well. I'm not sure what script is being used there.
>

I recommend updating the merge.sh script to use `git cherry-pick -x`
and then deleting the merge-git.sh script.

-Tom

> On Wed, Jan 15, 2020 at 4:54 PM Shoaib Meenai via llvm-dev <[hidden email] <mailto:[hidden email]>> wrote:
>
>     Now that we’re on the Git monorepo, is there an updated script for cherry-picking commits into the release branch? llvm/utils/release/merge.sh appears to still use SVN, and llvm/utils/release/merge-git.sh uses git-svn.____
>
>     _______________________________________________
>     LLVM Developers mailing list
>     [hidden email] <mailto:[hidden email]>
>     https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev
>
>
>
> _______________________________________________
> LLVM Developers mailing list
> [hidden email]
> https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev
>

_______________________________________________
LLVM Developers mailing list
[hidden email]
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev
Reply | Threaded
Open this post in threaded view
|

Re: [llvm-dev] Merge script for Git monorepo?

Doerfert, Johannes via llvm-dev
Any objection to deleting both and just using get cherry-pick -x directly?

On Thu, Jan 16, 2020 at 2:27 AM Tom Stellard via llvm-dev
<[hidden email]> wrote:

>
> On 01/15/2020 05:03 PM, Reid Kleckner via llvm-dev wrote:
> > Tom Stellard told me to use `git cherry-pick -x`, and if you look at the release branches, you can see it is used, although the old style is used as well. I'm not sure what script is being used there.
> >
>
> I recommend updating the merge.sh script to use `git cherry-pick -x`
> and then deleting the merge-git.sh script.
>
> -Tom
>
> > On Wed, Jan 15, 2020 at 4:54 PM Shoaib Meenai via llvm-dev <[hidden email] <mailto:[hidden email]>> wrote:
> >
> >     Now that we’re on the Git monorepo, is there an updated script for cherry-picking commits into the release branch? llvm/utils/release/merge.sh appears to still use SVN, and llvm/utils/release/merge-git.sh uses git-svn.____
> >
> >     _______________________________________________
> >     LLVM Developers mailing list
> >     [hidden email] <mailto:[hidden email]>
> >     https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev
> >
> >
> >
> > _______________________________________________
> > LLVM Developers mailing list
> > [hidden email]
> > https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev
> >
>
> _______________________________________________
> LLVM Developers mailing list
> [hidden email]
> https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev
_______________________________________________
LLVM Developers mailing list
[hidden email]
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev
Reply | Threaded
Open this post in threaded view
|

Re: [llvm-dev] Merge script for Git monorepo?

Doerfert, Johannes via llvm-dev
On 01/16/2020 06:55 AM, Hans Wennborg wrote:
> Any objection to deleting both and just using get cherry-pick -x directly?
>

That's fine with me too.

-Tom

> On Thu, Jan 16, 2020 at 2:27 AM Tom Stellard via llvm-dev
> <[hidden email]> wrote:
>>
>> On 01/15/2020 05:03 PM, Reid Kleckner via llvm-dev wrote:
>>> Tom Stellard told me to use `git cherry-pick -x`, and if you look at the release branches, you can see it is used, although the old style is used as well. I'm not sure what script is being used there.
>>>
>>
>> I recommend updating the merge.sh script to use `git cherry-pick -x`
>> and then deleting the merge-git.sh script.
>>
>> -Tom
>>
>>> On Wed, Jan 15, 2020 at 4:54 PM Shoaib Meenai via llvm-dev <[hidden email] <mailto:[hidden email]>> wrote:
>>>
>>>     Now that we’re on the Git monorepo, is there an updated script for cherry-picking commits into the release branch? llvm/utils/release/merge.sh appears to still use SVN, and llvm/utils/release/merge-git.sh uses git-svn.____
>>>
>>>     _______________________________________________
>>>     LLVM Developers mailing list
>>>     [hidden email] <mailto:[hidden email]>
>>>     https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev
>>>
>>>
>>>
>>> _______________________________________________
>>> LLVM Developers mailing list
>>> [hidden email]
>>> https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev
>>>
>>
>> _______________________________________________
>> LLVM Developers mailing list
>> [hidden email]
>> https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev
>

_______________________________________________
LLVM Developers mailing list
[hidden email]
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev
Reply | Threaded
Open this post in threaded view
|

Re: [llvm-dev] Merge script for Git monorepo?

Doerfert, Johannes via llvm-dev
On Thu, Jan 16, 2020 at 3:56 PM Tom Stellard <[hidden email]> wrote:
>
> On 01/16/2020 06:55 AM, Hans Wennborg wrote:
> > Any objection to deleting both and just using get cherry-pick -x directly?
> >
>
> That's fine with me too.

Cool. Deleted them (and also tag.sh) in 0ab035ae504deaba4bc24d32bc38c6bc3be58e01

Thanks,
Hans

> > On Thu, Jan 16, 2020 at 2:27 AM Tom Stellard via llvm-dev
> > <[hidden email]> wrote:
> >>
> >> On 01/15/2020 05:03 PM, Reid Kleckner via llvm-dev wrote:
> >>> Tom Stellard told me to use `git cherry-pick -x`, and if you look at the release branches, you can see it is used, although the old style is used as well. I'm not sure what script is being used there.
> >>>
> >>
> >> I recommend updating the merge.sh script to use `git cherry-pick -x`
> >> and then deleting the merge-git.sh script.
> >>
> >> -Tom
> >>
> >>> On Wed, Jan 15, 2020 at 4:54 PM Shoaib Meenai via llvm-dev <[hidden email] <mailto:[hidden email]>> wrote:
> >>>
> >>>     Now that we’re on the Git monorepo, is there an updated script for cherry-picking commits into the release branch? llvm/utils/release/merge.sh appears to still use SVN, and llvm/utils/release/merge-git.sh uses git-svn.____
> >>>
> >>>     _______________________________________________
> >>>     LLVM Developers mailing list
> >>>     [hidden email] <mailto:[hidden email]>
> >>>     https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev
> >>>
> >>>
> >>>
> >>> _______________________________________________
> >>> LLVM Developers mailing list
> >>> [hidden email]
> >>> https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev
> >>>
> >>
> >> _______________________________________________
> >> LLVM Developers mailing list
> >> [hidden email]
> >> https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev
> >
>
_______________________________________________
LLVM Developers mailing list
[hidden email]
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev