kicad-developers team mailing list archive

[Wayne Stambaugh <stambaughw@xxxxxxxxx>]

Jeff,

As a general rule, we merge changes into the development branch and then
merge them into the stable release branch after they have been tested.
In the past this has only been bug fixes so your case is slightly
different.  The problem I see with merging your changes into the 5.1
branch first is that they will not get as much testing as they would if
you merged your changes into the development branch.  I would prefer
that we merge changes into the development branch so that nightly builds
can be used to get some good testing.  Any bug fixes to your changes can
then be merged into the 5.1 branch.  Does anyone see any reason not to
do it this way?

Please do not merge your changes into the development branch just yet.
Orson just fixed a bug and I'm considering retagging v5 to include this fix.

Cheers,

Wayne

On 7/16/2018 5:05 AM, Jeff Young wrote:
> Thanks, JP!  I’ll make the fix.
> 
>> On 16 Jul 2018, at 09:24, jp charras <jp.charras@xxxxxxxxxx> wrote:
>>
>> Le 16/07/2018 à 10:10, Jeff Young a écrit :
>>> Well, rats.  I couldn’t figure out why "git rebase —interactive" wasn’t showing me any of my
>>> commits, and it turns out that I somehow accidentally merged them all to origin/5.1 sometime last
>>> night.  Anyway, you don’t have to fetch my private branch to test it anymore; the kicad 5.1 branch
>>> will do nicely.
>>>
>>> Let me know if the paged dialog issues are keeping anyone from getting work done and I’ll try to
>>> figure out how to revert those commits.
>>
>> Hi, Jeff
>> The paged dialog issue is due to the fact the panels (pages) have an incorrect parent.
>> Currently, these panels have the dialog itself as parent.
>> They should have m_treebook (the wxTreeBook similar to a wxNotebook) as parent.
>>
>> (This change fixes the issue on W7)
>>
>>>
>>> Cheers,
>>> Jeff.
>>
>> -- 
>> Jean-Pierre CHARRAS
>>
>> _______________________________________________
>> Mailing list: https://launchpad.net/~kicad-developers
>> Post to     : kicad-developers@xxxxxxxxxxxxxxxxxxx
>> Unsubscribe : https://launchpad.net/~kicad-developers
>> More help   : https://help.launchpad.net/ListHelp
> 
> 
> _______________________________________________
> Mailing list: https://launchpad.net/~kicad-developers
> Post to     : kicad-developers@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~kicad-developers
> More help   : https://help.launchpad.net/ListHelp
>