Thread overview | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|
|
August 20, 2014 [dmd-beta] merging branch to master | ||||
---|---|---|---|---|
| ||||
Since 2.066 is released, it is time to merge the branch back to master so I can can start picking for 2.066.1 and branch 2.067. I'm I correct in assuming I should do this directly in the repro or should I be conducting the merge on a fork and submit a pull? Please advise.
_______________________________________________
dmd-beta mailing list
dmd-beta@puremagic.com
http://lists.puremagic.com/mailman/listinfo/dmd-beta
|
August 20, 2014 Re: [dmd-beta] merging branch to master | ||||
---|---|---|---|---|
| ||||
Posted in reply to Andrew Edwards | Wouldn't making a pull request from the 2.066 branch to master do the merge just fine? On Wed, Aug 20, 2014 at 2:29 PM, Andrew Edwards via dmd-beta <dmd-beta@puremagic.com> wrote: > Since 2.066 is released, it is time to merge the branch back to master so I > can can start picking for 2.066.1 and branch 2.067. I'm I correct in > assuming I should do this directly in the repro or should I be conducting > the merge on a fork and submit a pull? Please advise. > _______________________________________________ > dmd-beta mailing list > dmd-beta@puremagic.com > http://lists.puremagic.com/mailman/listinfo/dmd-beta _______________________________________________ dmd-beta mailing list dmd-beta@puremagic.com http://lists.puremagic.com/mailman/listinfo/dmd-beta |
August 20, 2014 Re: [dmd-beta] merging branch to master | ||||
---|---|---|---|---|
| ||||
Posted in reply to Daniel Murphy Attachments:
| Not sure how to pull that off. I merge the branch then I ceate a pull
recquest from local master to remote master? Somehow I don't see that
working. But of course I'm not an advanced git user so please provide a
little more detail.
On Aug 20, 2014 3:51 PM, "Daniel Murphy" <yebblies@gmail.com> wrote:
> Wouldn't making a pull request from the 2.066 branch to master do the merge just fine?
>
> On Wed, Aug 20, 2014 at 2:29 PM, Andrew Edwards via dmd-beta <dmd-beta@puremagic.com> wrote:
> > Since 2.066 is released, it is time to merge the branch back to master
> so I
> > can can start picking for 2.066.1 and branch 2.067. I'm I correct in
> > assuming I should do this directly in the repro or should I be conducting
> > the merge on a fork and submit a pull? Please advise.
> > _______________________________________________
> > dmd-beta mailing list
> > dmd-beta@puremagic.com
> > http://lists.puremagic.com/mailman/listinfo/dmd-beta
>
|
August 20, 2014 Re: [dmd-beta] merging branch to master | ||||
---|---|---|---|---|
| ||||
Posted in reply to Andrew Edwards | No, just make a pull request from upstream/2.066 to upstream/master. Or from AndrewEdwards/2.066 to upstream/master I guess. A pull request causes a merge, so it should work in theory. If if does require special merge steps, then doing the merge in a branch and making a pull request against master should do it as well. On Wed, Aug 20, 2014 at 5:03 PM, Andrew Edwards <edwards.ac@gmail.com> wrote: > Not sure how to pull that off. I merge the branch then I ceate a pull recquest from local master to remote master? Somehow I don't see that working. But of course I'm not an advanced git user so please provide a little more detail. > > On Aug 20, 2014 3:51 PM, "Daniel Murphy" <yebblies@gmail.com> wrote: >> >> Wouldn't making a pull request from the 2.066 branch to master do the merge just fine? >> >> On Wed, Aug 20, 2014 at 2:29 PM, Andrew Edwards via dmd-beta <dmd-beta@puremagic.com> wrote: >> > Since 2.066 is released, it is time to merge the branch back to master >> > so I >> > can can start picking for 2.066.1 and branch 2.067. I'm I correct in >> > assuming I should do this directly in the repro or should I be >> > conducting >> > the merge on a fork and submit a pull? Please advise. >> > _______________________________________________ >> > dmd-beta mailing list >> > dmd-beta@puremagic.com >> > http://lists.puremagic.com/mailman/listinfo/dmd-beta _______________________________________________ dmd-beta mailing list dmd-beta@puremagic.com http://lists.puremagic.com/mailman/listinfo/dmd-beta |
August 20, 2014 Re: [dmd-beta] merging branch to master | ||||
---|---|---|---|---|
| ||||
Posted in reply to Daniel Murphy Attachments:
| Why is merging even necessary? Do we have any commits in beta branch that are not also in master? I thought every single one was cherry-picked
On Wed, Aug 20, 2014 at 9:11 AM, Daniel Murphy via dmd-beta < dmd-beta@puremagic.com> wrote:
> No, just make a pull request from upstream/2.066 to upstream/master. Or from AndrewEdwards/2.066 to upstream/master I guess. A pull request causes a merge, so it should work in theory.
>
> If if does require special merge steps, then doing the merge in a branch and making a pull request against master should do it as well.
>
> On Wed, Aug 20, 2014 at 5:03 PM, Andrew Edwards <edwards.ac@gmail.com> wrote:
> > Not sure how to pull that off. I merge the branch then I ceate a pull recquest from local master to remote master? Somehow I don't see that working. But of course I'm not an advanced git user so please provide a little more detail.
> >
> > On Aug 20, 2014 3:51 PM, "Daniel Murphy" <yebblies@gmail.com> wrote:
> >>
> >> Wouldn't making a pull request from the 2.066 branch to master do the merge just fine?
> >>
> >> On Wed, Aug 20, 2014 at 2:29 PM, Andrew Edwards via dmd-beta <dmd-beta@puremagic.com> wrote:
> >> > Since 2.066 is released, it is time to merge the branch back to master
> >> > so I
> >> > can can start picking for 2.066.1 and branch 2.067. I'm I correct in
> >> > assuming I should do this directly in the repro or should I be
> >> > conducting
> >> > the merge on a fork and submit a pull? Please advise.
> >> > _______________________________________________
> >> > dmd-beta mailing list
> >> > dmd-beta@puremagic.com
> >> > http://lists.puremagic.com/mailman/listinfo/dmd-beta
> _______________________________________________
> dmd-beta mailing list
> dmd-beta@puremagic.com
> http://lists.puremagic.com/mailman/listinfo/dmd-beta
>
|
August 20, 2014 Re: [dmd-beta] merging branch to master | ||||
---|---|---|---|---|
| ||||
Posted in reply to Михаил Страшун | Somebody argued for it before, something like it means later releases have earlier releases as parent commits. On Wed, Aug 20, 2014 at 10:48 PM, Михаил Страшун <public@dicebot.lv> wrote: > Why is merging even necessary? Do we have any commits in beta branch that are not also in master? I thought every single one was cherry-picked > > > On Wed, Aug 20, 2014 at 9:11 AM, Daniel Murphy via dmd-beta <dmd-beta@puremagic.com> wrote: >> >> No, just make a pull request from upstream/2.066 to upstream/master. Or from AndrewEdwards/2.066 to upstream/master I guess. A pull request causes a merge, so it should work in theory. >> >> If if does require special merge steps, then doing the merge in a branch and making a pull request against master should do it as well. >> >> On Wed, Aug 20, 2014 at 5:03 PM, Andrew Edwards <edwards.ac@gmail.com> wrote: >> > Not sure how to pull that off. I merge the branch then I ceate a pull recquest from local master to remote master? Somehow I don't see that working. But of course I'm not an advanced git user so please provide a little more detail. >> > >> > On Aug 20, 2014 3:51 PM, "Daniel Murphy" <yebblies@gmail.com> wrote: >> >> >> >> Wouldn't making a pull request from the 2.066 branch to master do the merge just fine? >> >> >> >> On Wed, Aug 20, 2014 at 2:29 PM, Andrew Edwards via dmd-beta <dmd-beta@puremagic.com> wrote: >> >> > Since 2.066 is released, it is time to merge the branch back to >> >> > master >> >> > so I >> >> > can can start picking for 2.066.1 and branch 2.067. I'm I correct in >> >> > assuming I should do this directly in the repro or should I be >> >> > conducting >> >> > the merge on a fork and submit a pull? Please advise. >> >> > _______________________________________________ >> >> > dmd-beta mailing list >> >> > dmd-beta@puremagic.com >> >> > http://lists.puremagic.com/mailman/listinfo/dmd-beta >> _______________________________________________ >> dmd-beta mailing list >> dmd-beta@puremagic.com >> http://lists.puremagic.com/mailman/listinfo/dmd-beta > > _______________________________________________ dmd-beta mailing list dmd-beta@puremagic.com http://lists.puremagic.com/mailman/listinfo/dmd-beta |
August 20, 2014 Re: [dmd-beta] merging branch to master | ||||
---|---|---|---|---|
| ||||
Posted in reply to Daniel Murphy Attachments:
| Ah, ok, no problem. It shouldn't harm just sounds a bit weird.
On Wed, Aug 20, 2014 at 3:18 PM, Daniel Murphy <yebblies@gmail.com> wrote:
> Somebody argued for it before, something like it means later releases have earlier releases as parent commits.
>
> On Wed, Aug 20, 2014 at 10:48 PM, Михаил Страшун <public@dicebot.lv> wrote:
> > Why is merging even necessary? Do we have any commits in beta branch that are not also in master? I thought every single one was cherry-picked
> >
> >
> > On Wed, Aug 20, 2014 at 9:11 AM, Daniel Murphy via dmd-beta <dmd-beta@puremagic.com> wrote:
> >>
> >> No, just make a pull request from upstream/2.066 to upstream/master. Or from AndrewEdwards/2.066 to upstream/master I guess. A pull request causes a merge, so it should work in theory.
> >>
> >> If if does require special merge steps, then doing the merge in a branch and making a pull request against master should do it as well.
> >>
> >> On Wed, Aug 20, 2014 at 5:03 PM, Andrew Edwards <edwards.ac@gmail.com> wrote:
> >> > Not sure how to pull that off. I merge the branch then I ceate a pull recquest from local master to remote master? Somehow I don't see that working. But of course I'm not an advanced git user so please provide
> a
> >> > little more detail.
> >> >
> >> > On Aug 20, 2014 3:51 PM, "Daniel Murphy" <yebblies@gmail.com> wrote:
> >> >>
> >> >> Wouldn't making a pull request from the 2.066 branch to master do the merge just fine?
> >> >>
> >> >> On Wed, Aug 20, 2014 at 2:29 PM, Andrew Edwards via dmd-beta <dmd-beta@puremagic.com> wrote:
> >> >> > Since 2.066 is released, it is time to merge the branch back to
> >> >> > master
> >> >> > so I
> >> >> > can can start picking for 2.066.1 and branch 2.067. I'm I correct
> in
> >> >> > assuming I should do this directly in the repro or should I be
> >> >> > conducting
> >> >> > the merge on a fork and submit a pull? Please advise.
> >> >> > _______________________________________________
> >> >> > dmd-beta mailing list
> >> >> > dmd-beta@puremagic.com
> >> >> > http://lists.puremagic.com/mailman/listinfo/dmd-beta
> >> _______________________________________________
> >> dmd-beta mailing list
> >> dmd-beta@puremagic.com
> >> http://lists.puremagic.com/mailman/listinfo/dmd-beta
> >
> >
>
|
August 20, 2014 Re: [dmd-beta] merging branch to master | ||||
---|---|---|---|---|
| ||||
Posted in reply to Михаил Страшун | There's discussion in an email on this list called "2.065 Final Release Prep" My vague understanding is when catching-up LDC, they first merge the release branch and then try to go from there to master/another release. Because of the duplicated commits, there are a bunch of conflicts etc. On Wed, Aug 20, 2014 at 11:32 PM, Михаил Страшун <public@dicebot.lv> wrote: > Ah, ok, no problem. It shouldn't harm just sounds a bit weird. > > > On Wed, Aug 20, 2014 at 3:18 PM, Daniel Murphy <yebblies@gmail.com> wrote: >> >> Somebody argued for it before, something like it means later releases have earlier releases as parent commits. >> >> On Wed, Aug 20, 2014 at 10:48 PM, Михаил Страшун <public@dicebot.lv> wrote: >> > Why is merging even necessary? Do we have any commits in beta branch >> > that >> > are not also in master? I thought every single one was cherry-picked >> > >> > >> > On Wed, Aug 20, 2014 at 9:11 AM, Daniel Murphy via dmd-beta <dmd-beta@puremagic.com> wrote: >> >> >> >> No, just make a pull request from upstream/2.066 to upstream/master. Or from AndrewEdwards/2.066 to upstream/master I guess. A pull request causes a merge, so it should work in theory. >> >> >> >> If if does require special merge steps, then doing the merge in a branch and making a pull request against master should do it as well. >> >> >> >> On Wed, Aug 20, 2014 at 5:03 PM, Andrew Edwards <edwards.ac@gmail.com> wrote: >> >> > Not sure how to pull that off. I merge the branch then I ceate a pull >> >> > recquest from local master to remote master? Somehow I don't see that >> >> > working. But of course I'm not an advanced git user so please provide >> >> > a >> >> > little more detail. >> >> > >> >> > On Aug 20, 2014 3:51 PM, "Daniel Murphy" <yebblies@gmail.com> wrote: >> >> >> >> >> >> Wouldn't making a pull request from the 2.066 branch to master do >> >> >> the >> >> >> merge just fine? >> >> >> >> >> >> On Wed, Aug 20, 2014 at 2:29 PM, Andrew Edwards via dmd-beta <dmd-beta@puremagic.com> wrote: >> >> >> > Since 2.066 is released, it is time to merge the branch back to >> >> >> > master >> >> >> > so I >> >> >> > can can start picking for 2.066.1 and branch 2.067. I'm I correct >> >> >> > in >> >> >> > assuming I should do this directly in the repro or should I be >> >> >> > conducting >> >> >> > the merge on a fork and submit a pull? Please advise. >> >> >> > _______________________________________________ >> >> >> > dmd-beta mailing list >> >> >> > dmd-beta@puremagic.com >> >> >> > http://lists.puremagic.com/mailman/listinfo/dmd-beta >> >> _______________________________________________ >> >> dmd-beta mailing list >> >> dmd-beta@puremagic.com >> >> http://lists.puremagic.com/mailman/listinfo/dmd-beta >> > >> > > > _______________________________________________ dmd-beta mailing list dmd-beta@puremagic.com http://lists.puremagic.com/mailman/listinfo/dmd-beta |
August 22, 2014 Re: [dmd-beta] merging branch to master | ||||
---|---|---|---|---|
| ||||
Posted in reply to Andrew Edwards Attachments:
| I opened four PRs in each repos. https://github.com/D-Programming-Language/dmd/pull/3883 https://github.com/D-Programming-Language/druntime/pull/930 https://github.com/D-Programming-Language/phobos/pull/2449 https://github.com/D-Programming-Language/dlang.org/pull/636 Kenji Hara 2014-08-20 13:29 GMT+09:00 Andrew Edwards via dmd-beta < dmd-beta@puremagic.com>: > Since 2.066 is released, it is time to merge the branch back to master so > I can can start picking for 2.066.1 and branch 2.067. I'm I correct in > assuming I should do this directly in the repro or should I be conducting > the merge on a fork and submit a pull? Please advise. > _______________________________________________ > dmd-beta mailing list > dmd-beta@puremagic.com > http://lists.puremagic.com/mailman/listinfo/dmd-beta |
August 22, 2014 Re: [dmd-beta] merging branch to master | ||||
---|---|---|---|---|
| ||||
Posted in reply to Kenji Hara | On 08/21/2014 07:19 PM, Kenji Hara via dmd-beta wrote: > I opened four PRs in each repos. > > https://github.com/D-Programming-Language/dmd/pull/3883 > https://github.com/D-Programming-Language/druntime/pull/930 > https://github.com/D-Programming-Language/phobos/pull/2449 > https://github.com/D-Programming-Language/dlang.org/pull/636 > > Kenji Hara Thanks Kenji _______________________________________________ dmd-beta mailing list dmd-beta@puremagic.com http://lists.puremagic.com/mailman/listinfo/dmd-beta |
Copyright © 1999-2021 by the D Language Foundation