← Back to team overview

kicad-developers team mailing list archive

Re: 5.1 branch

 

No time like the present!

-S

Am Mo., 16. Juli 2018 um 08:49 Uhr schrieb Maciej Sumiński <
maciej.suminski@xxxxxxx>:

> I have the script ready to run. It will just change all KiCad bug
> statuses from 'Fix Committed' to 'Fix Release'. I assume there are no
> bugs that are marked as 'Fix Committed', but not actually in the master
> branch, right? Are you ready for an infinite stream of bug tracker
> notifications? :>
>
> Cheers,
> Orson
>
> On 07/16/2018 05:13 PM, Wayne Stambaugh wrote:
> > That would probably be the easiest solution with the least amount of
> > risk.  Although you could not run it for point releases because bugs
> > that are only valid for the development branch would get set to fix
> > released which would not be correct.
> >
> > On 7/16/2018 11:08 AM, Maciej Sumiński wrote:
> >> It is terribly tedious to go through the bug list and change statuses
> >> one by one, so I offer to help with the bug report status fiddling. We
> >> may employ Janitor, but I guess it would be better to execute a simple
> >> script to change Fix Committed->Fix Released whenever we release a new
> >> version.
> >>
> >> Cheers,
> >> Orson
> >>
> >> On 07/16/2018 03:30 PM, Wayne Stambaugh 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
> >>>>
> >>>
> >>> _______________________________________________
> >>> 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
> >
>
>
> _______________________________________________
> 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