> On 11/04/13 15:02, Samuli Seppänen wrote: >>> Hi, >>> >>> On Thu, Apr 11, 2013 at 11:33:58AM +0200, Gert Doering wrote: >>>> Your patch has been applied to the master branch (ACK by me). >>>> >>>> I'm not sure whether we need this in release/2.3, but if people see the >>>> need, please speak up and I'll cherry-pick :-) >>>> >>>> commit 662ce6acc065bddf6490b3494725b8b3987b7def (master) >>> ... unfortunately, it breaks --disable-managemnt builds :-( - good that >>> we have buildbots, stupid me for not noticing it before ACK-and-push. >> I wonder if using a "staging" repo would be too much trouble? Buildbots >> could track it, and only after all builds have succeeded, the changes >> would be pushed to master. > Tempting thought. But I'd say it will be more maintenance than real > benefit in the long run. > > Using git-revert will actually document better what we tried and why we > didn't like that patch after all. We don't need to try hide our > mistakes that well :) What mistakes? We don't make mistakes!
> > Rather have a policy ... if a patch breaks something, fix it within > 24-48 hours, if not use git-revert. > Sounds like a plan. -- Samuli Seppänen Community Manager OpenVPN Technologies, Inc irc freenode net: mattock