cordova-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Filip Maj <>
Subject Re: ATTN: I am going to merge plugman future into master branch
Date Tue, 23 Apr 2013 22:29:51 GMT
The code bases have diverged (especially the tests).

I am trying to cherry pick shit back into future. I think reapplying the
two main additions that went into master (iOS custom config + wp7 support)
is the better way to go.

On 4/23/13 3:23 PM, "Anis KADRI" <> wrote:

>Why do you have to delete master?
>On Tue, Apr 23, 2013 at 3:02 PM, Filip Maj <> wrote:
>> Actually, I will be:
>> - cherry picking recent commits that went into master back into future
>> - deleting master on the apache remote
>> - pushing up future as the new master
>> Outstanding tasks are finish tests for blackberry, iOS and common
>> handlers, and going over the old node unit tests and seeing if any of
>> those are missing from the new jasmine specs.

View raw message