You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@rocketmq.apache.org by Roman Shtykh <rs...@yahoo.com.INVALID> on 2017/08/01 08:12:57 UTC
Re: The new branching model has been put into effect.
Hi Yukon,
Can you confirm the release was done correctly (with all modifications incorporated, as advertised)?
-- Roman
On Friday, July 14, 2017 10:37 AM, yukon <yu...@apache.org> wrote:
Hi,
Thanks guys, actually the release manager will do a sync between `master`
and `develop`(duplex merge) when release a new version, so this diff only
will occur in the gap between two releases.
But... Maybe there is something wrong, I will check it~
Regards,
yukon
On Thu, Jul 13, 2017 at 10:00 AM, Zhanhui Li <li...@gmail.com> wrote:
> Agree, develop and master branches should not split. We need to fix this
> issue.
>
> > 在 2017年7月12日,下午9:23,Roman Shtykh <rs...@yahoo.com.INVALID> 写道:
> >
> > Folks,
> > Please have a look at https://github.com/apache/incubator-rocketmq/tree/
> develop
> > This branch is 82 commits ahead, 74 commits behind master. <-- how can
> this happen? considering we had a recent release.
> > Do we have the situation Justin described before -- "In project where we
> had this split it just ends up being more work, people accidentally check
> into the wrong branch and I’ve see a lot of merge issues"?
> >
> > I'll say it again, but it is very inconvenient to use gitflow model on
> github (when on github you normally commit on master branch).
> >
> > -- Roman
> >
> > On Friday, March 17, 2017 11:41 AM, Justin Mclean <
> justin@classsoftware.com> wrote:
> >
> >
> > Hi,
> >
> > I also don't see there's a real need to split master and develop. In
> project where we had this split it just ends up being more work, people
> accidentally check into the wrong branch and I’ve see a lot of merge issues.
> >
> > That being said the project is free to select whatever model they want.
> >
> > Thanks,
> > Justin
> >
>
>
Re: The new branching model has been put into effect.
Posted by Xinyu Zhou <zh...@xinyu.im>.
Don't worry. The latest release is right, contains everything in the release note. We just should do a duplex merge after the release, simple, right?
On Wed, Aug 02, 2017 at 8:51am, Roman Shtykh < rshtykh@yahoo.com.invalid [rshtykh@yahoo.com.invalid] > wrote:
Hi Yukon,
Thanks a lot!
There are two issues then.
1. The latest release is wrong and probably doesn't contain everything as advertised. Shall we cancel it and re-release?Do mentors consider it a problem?
2. How can we make sure that the next release is done correctly?
Obviously, 'develop' branch introduces extra efforts for merging and release. It doesn't seem work well.
-- Roman
On Tuesday, August 1, 2017 6:02 PM, yukon <yu...@apache.org> wrote:
Hi Roman,
The last release didn't do a right merge between develop and master branch,
so we saw a big commit gap.
I have made a synchronization between these two branches just now.
Regards
On Tue, Aug 1, 2017 at 4:12 PM, Roman Shtykh <rs...@yahoo.com.invalid>
wrote:
> Hi Yukon,
> Can you confirm the release was done correctly (with all modifications
> incorporated, as advertised)?
> -- Roman
>
>
> On Friday, July 14, 2017 10:37 AM, yukon <yu...@apache.org> wrote:
>
>
> Hi,
>
>
> Thanks guys, actually the release manager will do a sync between `master`
> and `develop`(duplex merge) when release a new version, so this diff only
> will occur in the gap between two releases.
>
> But... Maybe there is something wrong, I will check it~
>
>
> Regards,
> yukon
>
> On Thu, Jul 13, 2017 at 10:00 AM, Zhanhui Li <li...@gmail.com> wrote:
>
> > Agree, develop and master branches should not split. We need to fix this
> > issue.
> >
> > > 在 2017年7月12日,下午9:23,Roman Shtykh <rs...@yahoo.com.INVALID> 写道:
> > >
> > > Folks,
> > > Please have a look at https://github.com/apache/
> incubator-rocketmq/tree/
> > develop
> > > This branch is 82 commits ahead, 74 commits behind master. <-- how can
> > this happen? considering we had a recent release.
> > > Do we have the situation Justin described before -- "In project where
> we
> > had this split it just ends up being more work, people accidentally check
> > into the wrong branch and I’ve see a lot of merge issues"?
> > >
> > > I'll say it again, but it is very inconvenient to use gitflow model on
> > github (when on github you normally commit on master branch).
> > >
> > > -- Roman
> > >
> > > On Friday, March 17, 2017 11:41 AM, Justin Mclean <
> > justin@classsoftware.com> wrote:
> > >
> > >
> > > Hi,
> > >
> > > I also don't see there's a real need to split master and develop. In
> > project where we had this split it just ends up being more work, people
> > accidentally check into the wrong branch and I’ve see a lot of merge
> issues.
> > >
> > > That being said the project is free to select whatever model they want.
> > >
> > > Thanks,
> > > Justin
> > >
> >
> >
>
>
>
Re: The new branching model has been put into effect.
Posted by Roman Shtykh <rs...@yahoo.com.INVALID>.
Hi Yukon,
Thanks a lot!
There are two issues then.
1. The latest release is wrong and probably doesn't contain everything as advertised. Shall we cancel it and re-release?Do mentors consider it a problem?
2. How can we make sure that the next release is done correctly?
Obviously, 'develop' branch introduces extra efforts for merging and release. It doesn't seem work well.
-- Roman
On Tuesday, August 1, 2017 6:02 PM, yukon <yu...@apache.org> wrote:
Hi Roman,
The last release didn't do a right merge between develop and master branch,
so we saw a big commit gap.
I have made a synchronization between these two branches just now.
Regards
On Tue, Aug 1, 2017 at 4:12 PM, Roman Shtykh <rs...@yahoo.com.invalid>
wrote:
> Hi Yukon,
> Can you confirm the release was done correctly (with all modifications
> incorporated, as advertised)?
> -- Roman
>
>
> On Friday, July 14, 2017 10:37 AM, yukon <yu...@apache.org> wrote:
>
>
> Hi,
>
>
> Thanks guys, actually the release manager will do a sync between `master`
> and `develop`(duplex merge) when release a new version, so this diff only
> will occur in the gap between two releases.
>
> But... Maybe there is something wrong, I will check it~
>
>
> Regards,
> yukon
>
> On Thu, Jul 13, 2017 at 10:00 AM, Zhanhui Li <li...@gmail.com> wrote:
>
> > Agree, develop and master branches should not split. We need to fix this
> > issue.
> >
> > > 在 2017年7月12日,下午9:23,Roman Shtykh <rs...@yahoo.com.INVALID> 写道:
> > >
> > > Folks,
> > > Please have a look at https://github.com/apache/
> incubator-rocketmq/tree/
> > develop
> > > This branch is 82 commits ahead, 74 commits behind master. <-- how can
> > this happen? considering we had a recent release.
> > > Do we have the situation Justin described before -- "In project where
> we
> > had this split it just ends up being more work, people accidentally check
> > into the wrong branch and I’ve see a lot of merge issues"?
> > >
> > > I'll say it again, but it is very inconvenient to use gitflow model on
> > github (when on github you normally commit on master branch).
> > >
> > > -- Roman
> > >
> > > On Friday, March 17, 2017 11:41 AM, Justin Mclean <
> > justin@classsoftware.com> wrote:
> > >
> > >
> > > Hi,
> > >
> > > I also don't see there's a real need to split master and develop. In
> > project where we had this split it just ends up being more work, people
> > accidentally check into the wrong branch and I’ve see a lot of merge
> issues.
> > >
> > > That being said the project is free to select whatever model they want.
> > >
> > > Thanks,
> > > Justin
> > >
> >
> >
>
>
>
Re: The new branching model has been put into effect.
Posted by yukon <yu...@apache.org>.
Hi Roman,
The last release didn't do a right merge between develop and master branch,
so we saw a big commit gap.
I have made a synchronization between these two branches just now.
Regards
On Tue, Aug 1, 2017 at 4:12 PM, Roman Shtykh <rs...@yahoo.com.invalid>
wrote:
> Hi Yukon,
> Can you confirm the release was done correctly (with all modifications
> incorporated, as advertised)?
> -- Roman
>
>
> On Friday, July 14, 2017 10:37 AM, yukon <yu...@apache.org> wrote:
>
>
> Hi,
>
>
> Thanks guys, actually the release manager will do a sync between `master`
> and `develop`(duplex merge) when release a new version, so this diff only
> will occur in the gap between two releases.
>
> But... Maybe there is something wrong, I will check it~
>
>
> Regards,
> yukon
>
> On Thu, Jul 13, 2017 at 10:00 AM, Zhanhui Li <li...@gmail.com> wrote:
>
> > Agree, develop and master branches should not split. We need to fix this
> > issue.
> >
> > > 在 2017年7月12日,下午9:23,Roman Shtykh <rs...@yahoo.com.INVALID> 写道:
> > >
> > > Folks,
> > > Please have a look at https://github.com/apache/
> incubator-rocketmq/tree/
> > develop
> > > This branch is 82 commits ahead, 74 commits behind master. <-- how can
> > this happen? considering we had a recent release.
> > > Do we have the situation Justin described before -- "In project where
> we
> > had this split it just ends up being more work, people accidentally check
> > into the wrong branch and I’ve see a lot of merge issues"?
> > >
> > > I'll say it again, but it is very inconvenient to use gitflow model on
> > github (when on github you normally commit on master branch).
> > >
> > > -- Roman
> > >
> > > On Friday, March 17, 2017 11:41 AM, Justin Mclean <
> > justin@classsoftware.com> wrote:
> > >
> > >
> > > Hi,
> > >
> > > I also don't see there's a real need to split master and develop. In
> > project where we had this split it just ends up being more work, people
> > accidentally check into the wrong branch and I’ve see a lot of merge
> issues.
> > >
> > > That being said the project is free to select whatever model they want.
> > >
> > > Thanks,
> > > Justin
> > >
> >
> >
>
>
>