Hello,
This mail is just to clarify some rules for the new 0.11 branch: 1- Development of plugins and new features continues on the master branch. Everything that can possibly go into 0.10 should go to master first. This can include cleanups that are needed in the 0.11 branch such as removal of deprecated methods. 2- We periodically merge master into 0.11. I would like to see frequent merges. When you commit something to 0.11, try to merge the changes on master when possible. 3- At the end of the development cycle we want to switch the 0.11 and master branch and prepare for release. We don't want to do a massive merge at that point, so we need the small incremental merges. 4- changes to 0.11 that could end up in 0.10 as well can be cherry picked when needed. Note that this case should be very usual because it means that you failed to follow rule 1. The end result is that all the new features get developed and tested in 0.10 and eventually also end up in 0.11. Merges will probably get more difficult when the code bases are getting too different, when we get to that stage we will re-evaluate how to maintain the two branches. It could be that we only do a weekly merge then or even less frequent, we'll have to see. Wim ------------------------------------------------------------------------------ What happens now with your Lotus Notes apps - do you make another costly upgrade, or settle for being marooned without product support? Time to move off Lotus Notes and onto the cloud with Force.com, apps are easier to build, use, and manage than apps on traditional platforms. Sign up for the Lotus Notes Migration Kit to learn more. http://p.sf.net/sfu/salesforce-d2d _______________________________________________ gstreamer-devel mailing list [hidden email] https://lists.sourceforge.net/lists/listinfo/gstreamer-devel |
Administrator
|
On Tue, 2010-12-07 at 12:38 +0100, Wim Taymans wrote:
> Hello, A word of caution regarding "git push" for those with commit access. If you're tracking both master and 0.11, running "git push" without any arguments implies that you want to push *all* locally tracked branches to the *origin* repo. Better avoid regretting it by always specifying at least the branch name you wish to push. => git push <branchname> > > Wim > > > ------------------------------------------------------------------------------ > What happens now with your Lotus Notes apps - do you make another costly > upgrade, or settle for being marooned without product support? Time to move > off Lotus Notes and onto the cloud with Force.com, apps are easier to build, > use, and manage than apps on traditional platforms. Sign up for the Lotus > Notes Migration Kit to learn more. http://p.sf.net/sfu/salesforce-d2d > _______________________________________________ > gstreamer-devel mailing list > [hidden email] > https://lists.sourceforge.net/lists/listinfo/gstreamer-devel ------------------------------------------------------------------------------ What happens now with your Lotus Notes apps - do you make another costly upgrade, or settle for being marooned without product support? Time to move off Lotus Notes and onto the cloud with Force.com, apps are easier to build, use, and manage than apps on traditional platforms. Sign up for the Lotus Notes Migration Kit to learn more. http://p.sf.net/sfu/salesforce-d2d _______________________________________________ gstreamer-devel mailing list [hidden email] https://lists.sourceforge.net/lists/listinfo/gstreamer-devel |
On Tue, 2010-12-07 at 13:25 +0100, Edward Hervey wrote:
> A word of caution regarding "git push" for those with commit access. > > If you're tracking both master and 0.11, running "git push" without > any arguments implies that you want to push *all* locally tracked > branches to the *origin* repo. > > Better avoid regretting it by always specifying at least the branch > name you wish to push. > > => git push <branchname> Two more things worth mentioning: 1. there's git push --dry-run 2. it's possible to change the default behaviour of git push to something more conservative: git config --global push.default tracking or git config --global push.default current (see man git-config) Cheers -Tim ------------------------------------------------------------------------------ What happens now with your Lotus Notes apps - do you make another costly upgrade, or settle for being marooned without product support? Time to move off Lotus Notes and onto the cloud with Force.com, apps are easier to build, use, and manage than apps on traditional platforms. Sign up for the Lotus Notes Migration Kit to learn more. http://p.sf.net/sfu/salesforce-d2d _______________________________________________ gstreamer-devel mailing list [hidden email] https://lists.sourceforge.net/lists/listinfo/gstreamer-devel |
In reply to this post by Wim Taymans
On Tue, Dec 7, 2010 at 5:38 AM, Wim Taymans <[hidden email]> wrote:
> Hello, > > This mail is just to clarify some rules for the new 0.11 branch: > > 1- Development of plugins and new features continues on the master > branch. Everything that can possibly go into 0.10 should go to > master first. This can include cleanups that are needed in the 0.11 > branch such as removal of deprecated methods. > any opinions on v4l2/v4l2sink patches? We've got xoverlay, navigation, interlaced support (in addition to the rowstride stuff which is only for 0.11). Some of the patches are already in bugzilla. I can freshen up the patches for 0.10 if there is interest, or I can just focus on 0.11. BR, -R ------------------------------------------------------------------------------ This SF Dev2Dev email is sponsored by: WikiLeaks The End of the Free Internet http://p.sf.net/sfu/therealnews-com _______________________________________________ gstreamer-devel mailing list [hidden email] https://lists.sourceforge.net/lists/listinfo/gstreamer-devel |
Free forum by Nabble | Edit this page |