On 9/2/13 05:40 , Charles Steinkuehler wrote: > What is the git status for what is going to become 2.6? > > I'm switching away from the older xenomai builds in favor of the new > unified-build-candidate-2 branch. It looks like development on this is > mostly in MAH's github repo, but the branch appears in git.linuxcnc.org > as well. > > I'm wondering what branch(es) I need to pull from to stay current as 2.6 > begins to take shape: > > Is master getting merged into the ubc-2 branch? > > Is ubc-2 getting merged into master? > > Where is the 2.6-pre branch (or linuxcnc-next, or whatever it's going to > be called), or am I not understanding how the process is supposed to work?
The current status of 2.6 is this: * The 2.6 branch hasn't been created yet. * The 'master' branch on git.linuxcnc.org will become 2.6 in the future, after the fate of two outstanding feature branches is determined. * The first feature branch is joints_axes3. It's currently undergoing refinement for merging into master. * The other feature branch is unified-build-candidate-2. It's currently awaiting review from the wider development community. * Once those two merges happen, or we've decided to postpone them, we'll branch 2.6 off master. The schedule for all of this is unknown, but probably on a time scale of months rather than weeks or years. -- Sebastian Kuzminsky ------------------------------------------------------------------------------ Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! Discover the easy way to master current and previous Microsoft technologies and advance your career. Get an incredible 1,500+ hours of step-by-step tutorial videos with LearnDevNow. Subscribe today and save! http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk _______________________________________________ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
