2014-12-16 14:28 GMT+01:00 Boylan, James <[email protected]>: > A practice that I have seen is that master is master and general bug fixes > merge directly into master. If you are making a major feature or functional > change that will likely break things you make a branch for that, get it > working, tested and verified. And then merge that into master. > > that's what I am doing ever since ;)
It was really just the name issue for PRs. And if you check the mailing list archive, around two month ago there was a more or less endless branch on testing and how the branches should be named. The outcome was that master should never receive any commits that were not run through the testbench. Thus now there is master-candidate, which I merge into master when the testbench runs are ok. Just a very quick summary FYI. Rainer > It takes a little more maintenance, but it allows you to treat master as > the 'stable' branch without having to have a dedicated 'devel' branch. > > -- James > --- Sent from my mobile phone --- > > ----- Reply message ----- > From: "Tait Clarridge" <[email protected]> > To: "rsyslog-users" <[email protected]> > Subject: [rsyslog] master branch > Date: Tue, Dec 16, 2014 7:24 AM > > What about creating a branch called develop and working out of that > for all the pre-release/pre-RC work. > The default branch can be set in github, which is where the pull > requests will go by default. And when cloned, the default branch it > will check out. > > On Tue, Dec 16, 2014 at 7:14 AM, Boylan, James <[email protected]> > wrote: > > If you are looking to shift that direction then 'master-ok' could work. > Or 'master-tested'. Or even just 'stable' denoting that it has successfully > had all testbench tests completed on it. > > > > I think as long as it is documented in the readme.md file then you can > really name it whatever you feel works. > > > > -- James > > --- Sent from my mobile phone --- > > > > ----- Reply message ----- > > From: "singh.janmejay" <[email protected]> > > To: "rsyslog-users" <[email protected]> > > Subject: [rsyslog] master branch > > Date: Tue, Dec 16, 2014 5:52 AM > > > > Master-ok sounds better than master. It conveys the intent very clearly. > > > > -- > > Regards, > > Janmejay > > > > PS: Please blame the typos in this mail on my phone's uncivilized soft > > keyboard sporting it's not-so-smart-assist technology. > > > > On Dec 16, 2014 5:14 PM, "Rainer Gerhards" <[email protected]> > wrote: > > > >> HI all, > >> > >> we decided that master branch receives updates only after testbench run. > >> How important is this to us that this branch is named "master"? I ask > >> because almost all pull requests are done against master branch, which > >> means I need to manually merge them to master-candidate and close the > PR as > >> "unmerged". > >> > >> It would probably much more efficient to have "master" be the > experimental > >> branch, and when the testbench succeeds move it to something like > >> "master-ok" (or so). > >> > >> Comments? > >> > >> Rainer > >> _______________________________________________ > >> rsyslog mailing list > >> http://lists.adiscon.net/mailman/listinfo/rsyslog > >> http://www.rsyslog.com/professional-services/ > >> What's up with rsyslog? Follow https://twitter.com/rgerhards > >> NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a myriad > >> of sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if you > >> DON'T LIKE THAT. > >> > > _______________________________________________ > > rsyslog mailing list > > http://lists.adiscon.net/mailman/listinfo/rsyslog > > http://www.rsyslog.com/professional-services/ > > What's up with rsyslog? Follow https://twitter.com/rgerhards > > NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a myriad > of sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if you > DON'T LIKE THAT. > > _______________________________________________ > > rsyslog mailing list > > http://lists.adiscon.net/mailman/listinfo/rsyslog > > http://www.rsyslog.com/professional-services/ > > What's up with rsyslog? Follow https://twitter.com/rgerhards > > NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a myriad > of sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if you > DON'T LIKE THAT. > _______________________________________________ > rsyslog mailing list > http://lists.adiscon.net/mailman/listinfo/rsyslog > http://www.rsyslog.com/professional-services/ > What's up with rsyslog? Follow https://twitter.com/rgerhards > NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a myriad > of sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if you > DON'T LIKE THAT. > _______________________________________________ > rsyslog mailing list > http://lists.adiscon.net/mailman/listinfo/rsyslog > http://www.rsyslog.com/professional-services/ > What's up with rsyslog? Follow https://twitter.com/rgerhards > NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a myriad > of sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if you > DON'T LIKE THAT. > _______________________________________________ rsyslog mailing list http://lists.adiscon.net/mailman/listinfo/rsyslog http://www.rsyslog.com/professional-services/ What's up with rsyslog? Follow https://twitter.com/rgerhards NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a myriad of sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if you DON'T LIKE THAT.
