← Back to team overview

kicad-developers team mailing list archive

Re: 5.1 branch

 

I can't think of any reason not to change the fix committed bug reports
to fix released so if you have the time, have at it.

On 7/16/2018 9:54 AM, Jeff Young wrote:
> Cool.  I’ll wait a few more days to make sure everything is settled down and then merge the 5.1 stuff to master.
> 
> Should we go ahead and start making the Fix Committed bugs Fix Released, or do we want to wait for the release announcement?
> 
>> On 16 Jul 2018, at 14:30, Wayne Stambaugh <stambaughw@xxxxxxxxx> wrote:
>>
>> Hey Jeff,
>>
>> We have been manually changing the bug status from fix committed to fix
>> released after a new stable release.  AFAIK, the janitor does not handle
>> this.  I suppose the janitor could be modified to test for a new release
>> and change the tag for all bugs associated with that release.  That
>> would not be 100% accurate because there are bugs that have not been
>> associated with a branch but that would probably be easier than changing
>> them all manually.  I don't have a strong preference one way or the other.
>>
>> Wayne
>>
>> On 7/16/2018 9:20 AM, Jeff Young wrote:
>>> Hi Wayne,
>>>
>>> The other issue is that the Janitor is going to mark my fixes as Fix Committed, and I don’t know if the auto-bug-release facility is smart enough to check the milestone before converting Fix Committed to Fix Released.  So we may need to do that first too.
>>>
>>> Cheers,
>>> Jeff.
>>>
>>>> On 16 Jul 2018, at 14:15, Wayne Stambaugh <stambaughw@xxxxxxxxx> wrote:
>>>>
>>>> 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
>>>>>
>>>>
>>>> _______________________________________________
>>>> 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
>>>
> 


References