kicad-developers team mailing list archive

[Wayne Stambaugh <stambaughw@xxxxxxxxx>]

I am opposed to ripping apart merges to backport them to the 5.0 branch.
 There is too much room for error.  It's one thing to fix a merge
conflict when cherry picking.  It is an altogether different thing to
backport part of a commit.  This is why you should make commits as
atomic as possible.  If the time stamping commits could be cherry picked
unmodified without dragging any other 5.1 work into the 5.0 branch I
would be OK with that.  The problem is, any edited merges would not be
tested as they were committed to the development branch which means the
testing done by users running nightly builds would may not be valid.
AFAIK, very little testing gets done on the stable branch so we depend
on the nightly build testing to confirm our bug fixes don't cause any
other issues.

Cheers,

Wayne

On 8/13/2018 2:50 PM, Jeff Young wrote:
> Hi Seth,
> 
> It’s built on top of earlier changes,
> namely be1d6113d6a81bc414e06c5d080cc4917f5de1f1.
> 
> While that one's quite large, we could hand-edit out the
> directory-timestamping part.  It’d be a bit of work as we have to move
> from timestamping the files in the cache to timestamping the files in
> the directory, and we have to do that uniformly across save, load, and
> check-cache.
> 
> But it could be done.
> 
> Cheers,
> Jeff.
> 
> 
>> On 13 Aug 2018, at 18:06, Seth Hillbrand <seth@xxxxxxxxxxxxx
>> <mailto:seth@xxxxxxxxxxxxx>> wrote:
>>
>> Hi Jeff and others-
>>
>> Is there anything that would prevent us from merging f6f1c1e94 into
>> the 5.0.1 branch?  I was talking with an engineer on Twitter[1] about
>> some performance issues they were having assigning footprints in cvpcb
>> using MSW.  It sounded like it might be addressed by that work.
>>
>> -S
>>
>> [1] https://twitter.com/MayaPosch/status/1027660207709728769
>>
>> _______________________________________________
>> Mailing list: https://launchpad.net/~kicad-developers
>> <https://launchpad.net/%7Ekicad-developers>
>> Post to     : kicad-developers@xxxxxxxxxxxxxxxxxxx
>> <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx>
>> Unsubscribe : https://launchpad.net/~kicad-developers
>> <https://launchpad.net/%7Ekicad-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
>