Technically it's possible, with one huge BUT -- you'll need to force-push
which is really a bad idea.
Would rather suggest reverting stuff by:
$ git revert HASH
Here you can also revert several commits, or if you're really screwed up:
$ git diff master | patch -p1 -R
$ git commit -a -m
I like the idea! Doing test builds is always a time consuming and tedious
process, and forces me bother other coders to make windows builds ...
(thanks Antonis!).
Revert is the best option i guess. This should ideally be done by everyone
after using the build bots, but anyone can do it in case
Would it be possible to select an arbitrary branch on the builder page
instead of only `master` or `testbuild`? Or, can you enter any git ref
in the Revision text box? Then you wouldn't need to merge or revert
anything.
Cheers,
Alex
On Tue, Jul 29, 2014 at 5:25 PM, Lukas Tönne
Think this would not be a good idea, since all branch would make a
separate build on buildbot (we do not want to store tenth different
builds/arch archives there…).
And yes, merge master + commit diff + revert worked fine for Dalai, so
guess it’s the way to go. :)
Le 29/07/2014 09:31, Alex
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
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.
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
