Alright, after talking with Bastien my suggestion is: $ git checkout testbuild $ git merge origin/master $ git merge --squash mywippatch $ git commit $ git revert HEAD $ git push origin
Notice that this maintains the branch always 1:1 with origin/master. So no one has to clean after your commits. You will need to specify the hash of the HEAD^1 to the Builder Slave. Regards, Dalai -- blendernetwork.org/dalai-felinto www.dalaifelinto.com 2014-07-28 16:32 GMT-03:00 Dalai Felinto <[email protected]>: > Hi, > This is great, really useful. It would be really handy if at least the > testbuild branch in the server could use non-fast-forward. In other > words, if it could use it as follow: > > $ git checkout testbuild > $ git reset --hard origin/master > $ git merge --squash mywippatch > $ git commit > $ git push --force > > Would that be possible? Or git handles those permissions globally and > not per branch? > > Cheers, > Dalai > -- > blendernetwork.org/dalai-felinto > www.dalaifelinto.com > > > 2014-07-25 9:28 GMT-03:00 Bastien Montagne <[email protected]>: >> Hi fellow devs, >> >> This week we set up a way to make test builds on the buildbots (meaning >> you get release-like archives, easy to distribute! :) ). >> >> Here are the steps to follow: >> * Checkout the 'testbuild' branch, apply your code to it (probably by >> reseting it to master and then squash-merging in your own work); >> * Push your changes on remote repo; >> * Go to one of the buildbot's builders' page (e.g. >> https://builder.blender.org/builders/linux_glibc211_x86_64_scons) - note >> you'll need to do that for all platforms you want to build on. >> * Select 'testbuild' instead of 'master' in the branch dropdown, and >> force the build. >> * Note you can also force a given revision, can be handy as it means you >> can still build your work even if someone has overriden it in testbuild >> branch. >> * Download your testbuild as soon as it is finished! It will be replaced >> by the next test build (for a given builder). >> >> Quite obviously, let's try not to abuse the feature! :) >> >> _______________________________________________ >> Bf-committers mailing list >> [email protected] >> http://lists.blender.org/mailman/listinfo/bf-committers _______________________________________________ Bf-committers mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-committers
