On 3/3/14 16:18 , Sebastian Kuzminsky wrote: > On 3/3/14 16:12 , Robert Ellenberg wrote: >> >> As a possible solution, I've been able to rebase the RC branch onto the >> lastest master with minimal changes. If there is a recent build that we >> know is solid, I can rebase my branch onto that and push it. If I go down >> this route, should I increment the branch's name, or just overwrite the >> "bad" branch? > > Perfect. Wait for me to merge my 'platform-is-supported' code into > master within a few hours, then create a new branch (called > circular-blend-arc-rc2 maybe?) pointing at the same commit as -rc1, and > rebase -rc2 onto origin/master.
I just pushed the code to support this to master. The buildbot is busy building your branch, then it'll build my push to the master branch. I expect commit 55a8af72 on the master branch will pass all the tests, but then have problems building some of the debs. This is due to the ongoing work to add support to the buildbot for both 'old-style' (2.5 & master) and 'new-style' (unified build) branches. The debs that build successfully will go into the buildbot deb archive, and the debs that fail to build will report errors on irc. If the platforms supported by the master branch build debs successfully, feel free to rebase at your leisure. I expect all xenomai and rt-preempt dsc & deb buildslaves to fail, and all other buildslaves to pass. -- Sebastian Kuzminsky ------------------------------------------------------------------------------ Subversion Kills Productivity. Get off Subversion & Make the Move to Perforce. With Perforce, you get hassle-free workflows. Merge that actually works. Faster operations. Version large binaries. Built-in WAN optimization and the freedom to use Git, Perforce or both. Make the move to Perforce. http://pubads.g.doubleclick.net/gampad/clk?id=122218951&iu=/4140/ostg.clktrk _______________________________________________ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
