You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ariatosca.apache.org by Thomas Nadeau <tn...@gmail.com> on 2018/01/09 12:41:39 UTC

merging paused until release is completed

I just saw a PR pushed Vaish and realized we probably had not communicated
that we're holding off on merging PRs until the release is finished. The
reasoning is to leave master in its current state in case anything odd
happens and we need to redo the release (which has happened).

Note that PRs may need to be rebased once we open the gates again, as there
may be PRs ahead of yours.

Thanks for your patience until (hopefully) Wedneday.

--Tom

Re: merging paused until release is completed

Posted by Thomas Nadeau <tn...@gmail.com>.
Yes, to be clear, keep pushing PRs; we're just not merging onto Master
right now.

--Tom


On Tue, Jan 9, 2018 at 8:02 AM, Suneel Marthi <sm...@apache.org> wrote:

> I don't see why u can't push a PR when a release is in progress as long as
> the PRs are not merged until the release is finalized and have been rebased
> off of the latest master.
>
> Ofcourse you could always have development continue on a different branch
> if you are comfortable with merging and rebasing the branches to master.
>
> On Tue, Jan 9, 2018 at 7:52 AM, Thomas Nadeau <tn...@gmail.com>
> wrote:
>
> > I agree for the next release. This was just the easiest approach for me
> > since I had little assistance doing this first one.
> >
> > --Tom
> >
> > On Tue, Jan 9, 2018 at 7:49 AM, John D. Ament <jo...@apache.org>
> > wrote:
> >
> > > Does it make sense to create a branch for the release (when prepped)
> and
> > > merge that in when done?  I'd hate to see development slow down due to
> > the
> > > release window in flight.  Most other projects don't stop committing
> > while
> > > this is happening.
> > >
> > > On Tue, Jan 9, 2018 at 7:41 AM Thomas Nadeau <tn...@gmail.com>
> > > wrote:
> > >
> > > > I just saw a PR pushed Vaish and realized we probably had not
> > > communicated
> > > > that we're holding off on merging PRs until the release is finished.
> > The
> > > > reasoning is to leave master in its current state in case anything
> odd
> > > > happens and we need to redo the release (which has happened).
> > > >
> > > > Note that PRs may need to be rebased once we open the gates again, as
> > > there
> > > > may be PRs ahead of yours.
> > > >
> > > > Thanks for your patience until (hopefully) Wedneday.
> > > >
> > > > --Tom
> > > >
> > >
> >
>

Re: merging paused until release is completed

Posted by Suneel Marthi <sm...@apache.org>.
I don't see why u can't push a PR when a release is in progress as long as
the PRs are not merged until the release is finalized and have been rebased
off of the latest master.

Ofcourse you could always have development continue on a different branch
if you are comfortable with merging and rebasing the branches to master.

On Tue, Jan 9, 2018 at 7:52 AM, Thomas Nadeau <tn...@gmail.com> wrote:

> I agree for the next release. This was just the easiest approach for me
> since I had little assistance doing this first one.
>
> --Tom
>
> On Tue, Jan 9, 2018 at 7:49 AM, John D. Ament <jo...@apache.org>
> wrote:
>
> > Does it make sense to create a branch for the release (when prepped) and
> > merge that in when done?  I'd hate to see development slow down due to
> the
> > release window in flight.  Most other projects don't stop committing
> while
> > this is happening.
> >
> > On Tue, Jan 9, 2018 at 7:41 AM Thomas Nadeau <tn...@gmail.com>
> > wrote:
> >
> > > I just saw a PR pushed Vaish and realized we probably had not
> > communicated
> > > that we're holding off on merging PRs until the release is finished.
> The
> > > reasoning is to leave master in its current state in case anything odd
> > > happens and we need to redo the release (which has happened).
> > >
> > > Note that PRs may need to be rebased once we open the gates again, as
> > there
> > > may be PRs ahead of yours.
> > >
> > > Thanks for your patience until (hopefully) Wedneday.
> > >
> > > --Tom
> > >
> >
>

Re: merging paused until release is completed

Posted by Thomas Nadeau <tn...@gmail.com>.
I agree for the next release. This was just the easiest approach for me
since I had little assistance doing this first one.

--Tom

On Tue, Jan 9, 2018 at 7:49 AM, John D. Ament <jo...@apache.org> wrote:

> Does it make sense to create a branch for the release (when prepped) and
> merge that in when done?  I'd hate to see development slow down due to the
> release window in flight.  Most other projects don't stop committing while
> this is happening.
>
> On Tue, Jan 9, 2018 at 7:41 AM Thomas Nadeau <tn...@gmail.com>
> wrote:
>
> > I just saw a PR pushed Vaish and realized we probably had not
> communicated
> > that we're holding off on merging PRs until the release is finished. The
> > reasoning is to leave master in its current state in case anything odd
> > happens and we need to redo the release (which has happened).
> >
> > Note that PRs may need to be rebased once we open the gates again, as
> there
> > may be PRs ahead of yours.
> >
> > Thanks for your patience until (hopefully) Wedneday.
> >
> > --Tom
> >
>

Re: merging paused until release is completed

Posted by "John D. Ament" <jo...@apache.org>.
Does it make sense to create a branch for the release (when prepped) and
merge that in when done?  I'd hate to see development slow down due to the
release window in flight.  Most other projects don't stop committing while
this is happening.

On Tue, Jan 9, 2018 at 7:41 AM Thomas Nadeau <tn...@gmail.com> wrote:

> I just saw a PR pushed Vaish and realized we probably had not communicated
> that we're holding off on merging PRs until the release is finished. The
> reasoning is to leave master in its current state in case anything odd
> happens and we need to redo the release (which has happened).
>
> Note that PRs may need to be rebased once we open the gates again, as there
> may be PRs ahead of yours.
>
> Thanks for your patience until (hopefully) Wedneday.
>
> --Tom
>