Here is just an idea here @tres. Any changes for apple we push them
directly into master and cherry pick for the given stable branch.
On Thu, Nov 20, 2014 at 3:37 PM, Tres Finocchiaro <
[email protected]> wrote:
> I'll clarify a bit...
>
> all the mac work does that get thrown into master
>
>
> I've always targeted the Mac stuff for the current stable branch because
> they are all observable and reproducible bugs. Since we continue to offer
> patches to our current stable releases for bug-fix scenarios, Apple fixes
> are great candidates for our stable branch.... But...
>
> The problem with this methodology is that Apple's bugfixes may in turn be
> drastic changes to code, so we need to be careful as not to break our
> stable branch with experimental changes.
>
> For example -- The file association bug where double-clicking an MMPZ
> doesn't properly open the project... -- Apple require a shim to the way we
> open up our project files to intercept an event on load. In this case,
> fixing Apple may be deemed as something too risky and of the realm of a
> standard bug-fix. Here's how keypass does it:
> https://www.keepassx.org/dev/projects/keepassx/repository/revisions/master/entry/src/gui/Application.cpp
>
> So without knowledge of what code is changing, it's impossible to say for
> sure. stable-1.1 is the best place to issue the pull request for now.
>
> -Tres
>
> - [email protected]
>
> On Wed, Nov 19, 2014 at 12:02 PM, Tres Finocchiaro <
> [email protected]> wrote:
>
>> Target stable-1.1 for now. Well discuss the branch destination again on
>> the pull request. There's too much I'm the air to know for sure which
>> branch should be targeted. We should see the changes before making that
>> call.
>>
>
>
--
Jonathan Aquilina
------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=157005751&iu=/4140/ostg.clktrk
_______________________________________________
LMMS-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/lmms-devel
