← Back to team overview

kicad-developers team mailing list archive

Re: Bus upgrades merge

 

Yes I just squashed the parts that dont compile on their own.

On Sun, Mar 31, 2019, 19:48 Wayne Stambaugh <stambaughw@xxxxxxxxx> wrote:

> Jon,
>
> I thought we decided to squash your patch set or did you just squash
> part of the patch set?  I see 17 separate patches the archive you sent.
>
> Wayne
>
> On 3/31/19 7:39 PM, Jon Evans wrote:
> > Attached!
> >
> > On Sun, Mar 31, 2019 at 7:28 PM Wayne Stambaugh <stambaughw@xxxxxxxxx
> > <mailto:stambaughw@xxxxxxxxx>> wrote:
> >
> >     Jon,
> >
> >     Would you please post the squashed patch to the mailing list so I can
> >     get it merged?
> >
> >     Thanks,
> >
> >     Wayne
> >
> >     On 3/31/19 3:07 PM, Jon Evans wrote:
> >      > I went through and squashed the offending commits and updated the
> >     PRs.
> >      >
> >      > -Jon
> >      >
> >      > On Sun, Mar 31, 2019 at 2:22 PM Wayne Stambaugh
> >     <stambaughw@xxxxxxxxx <mailto:stambaughw@xxxxxxxxx>
> >      > <mailto:stambaughw@xxxxxxxxx <mailto:stambaughw@xxxxxxxxx>>>
> wrote:
> >      >
> >      >     If that's the case then it may make the most sense to squash
> >     everything
> >      >     into a single commit.
> >      >
> >      >     On 3/31/19 2:17 PM, Jon Evans wrote:
> >      >      > That one was very late and would be easy to squash.
> >     However, some
> >      >     of the
> >      >      > very early commits in the branch were split up for review
> >      >     purposes and
> >      >      > not intended to be built on their own.
> >      >      >
> >      >      > On Sun, Mar 31, 2019, 14:16 Wayne Stambaugh
> >     <stambaughw@xxxxxxxxx <mailto:stambaughw@xxxxxxxxx>
> >      >     <mailto:stambaughw@xxxxxxxxx <mailto:stambaughw@xxxxxxxxx>>
> >      >      > <mailto:stambaughw@xxxxxxxxx <mailto:stambaughw@xxxxxxxxx>
> >     <mailto:stambaughw@xxxxxxxxx <mailto:stambaughw@xxxxxxxxx>>>> wrote:
> >      >      >
> >      >      >     When was the code that did not build on msvc
> >     introduced?  If
> >      >     was early
> >      >      >     then it might make sense to squash everything.
> >     Otherwise, it
> >      >     may be
> >      >      >     worthwhile squashing from the commit where the build
> >     error was
> >      >      >     introduced to and including the commit where the build
> >     error
> >      >     was fixed.
> >      >      >      I don't have a preference one way or the other.  I'm
> >     open to
> >      >      >     suggestion.
> >      >      >
> >      >      >     On 3/31/19 11:14 AM, Jon Evans wrote:
> >      >      >     > Seth, I split up the initial rebased branch to make
> >     review
> >      >     a bit
> >      >      >     > easier.  I could squash everything into one huge
> >     commit if
> >      >     you'd
> >      >      >     prefer.
> >      >      >     >
> >      >      >     > On Sun, Mar 31, 2019 at 9:56 AM Seth Hillbrand
> >      >     <seth@xxxxxxxxxxxxx <mailto:seth@xxxxxxxxxxxxx>
> >     <mailto:seth@xxxxxxxxxxxxx <mailto:seth@xxxxxxxxxxxxx>>
> >      >      >     <mailto:seth@xxxxxxxxxxxxx <mailto:seth@xxxxxxxxxxxxx>
> >     <mailto:seth@xxxxxxxxxxxxx <mailto:seth@xxxxxxxxxxxxx>>>
> >      >      >     > <mailto:seth@xxxxxxxxxxxxx
> >     <mailto:seth@xxxxxxxxxxxxx> <mailto:seth@xxxxxxxxxxxxx
> >     <mailto:seth@xxxxxxxxxxxxx>>
> >      >     <mailto:seth@xxxxxxxxxxxxx <mailto:seth@xxxxxxxxxxxxx>
> >     <mailto:seth@xxxxxxxxxxxxx <mailto:seth@xxxxxxxxxxxxx>>>>> wrote:
> >      >      >     >
> >      >      >     >     Am 2019-03-30 17:33, schrieb Simon Richter:
> >      >      >     >     > Hi Wayne,
> >      >      >     >     >
> >      >      >     >     > On 30.03.19 21:30, Wayne Stambaugh wrote:
> >      >      >     >     >
> >      >      >     >     >> Is this the last of it?  If so, I will
> attempt to
> >      >     get this
> >      >      >     merged
> >      >      >     >     >> tomorrow.
> >      >      >     >     >
> >      >      >     >     > Compiles fine on msys2 and msvc. Not all
> >     intermediate
> >      >      >     commits compile,
> >      >      >     >     > but I'm not sure anyone does git-bisect anyway.
> >      >      >     >
> >      >      >     >     I use git bisect frequently.  Please do not push
> >      >     commits that
> >      >      >     do not
> >      >      >     >     compile.  This has been done previously and it
> added
> >      >     hours to
> >      >      >     fixing a
> >      >      >     >     single bug in 5.0.1.
> >      >      >     >
> >      >      >     >     -S
> >      >      >     >
> >      >      >     >     _______________________________________________
> >      >      >     >     Mailing list:
> >     https://launchpad.net/~kicad-developers
> >      >      >     >     Post to     :
> >     kicad-developers@xxxxxxxxxxxxxxxxxxx
> >     <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx>
> >      >     <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx
> >     <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx>>
> >      >      >     <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx
> >     <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx>
> >      >     <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx
> >     <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx>>>
> >      >      >     >     <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx
> >     <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx>
> >      >     <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx
> >     <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx>>
> >      >      >     <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx
> >     <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx>
> >      >     <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx
> >     <mailto: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
> >     <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx>
> >      >     <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx
> >     <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx>>
> >      >      >     <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx
> >     <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx>
> >      >     <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx
> >     <mailto: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
> >     <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx>
> >      >     <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx
> >     <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx>>
> >      >      >     <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx
> >     <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx>
> >      >     <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx
> >     <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx>>>
> >      >      >     Unsubscribe : https://launchpad.net/~kicad-developers
> >      >      >     More help   : https://help.launchpad.net/ListHelp
> >      >      >
> >      >
> >
>

Follow ups

References