← Back to team overview

kicad-developers team mailing list archive

Re: GAL branch

 

On 24/09/18 20:07, Wayne Stambaugh wrote:
> Hey Jeff,
> 
> On 9/21/2018 9:49 AM, Jeff Young wrote:
>> Hi Tom,
>>
>> Do you have additional fixes that are not in your branch of my repo?
>>
>> If not, does it make sense for me to rebase it on master?  (It would have to become “truth” at that point, but you could clone back from it.)
>>
>> Cheers,
>> Jeff.
> 
> From the testing I've done, this seems ready for wider user testing.  I
> think we ( and by we I mean you and Tom ;) ) should start preparing to
> merge this into the development branch.  I'm guessing giving the
> original starting branch that there are going to be some serious merge
> conflicts to be resolved.  As soon as 5.0.1 tagged, I say we pull the
> trigger on this and start working towards 5.1.  I know this doesn't
> impact the dev branch but as soon as the gal changes get merged, fixing
> bugs in both the stable 5 and dev branch are going to be significantly
> more difficult.  If anyone has any objections to this proposal, now
> would be the time.
> 

Hi Wayne,

Sounds like a plan! It was already rebased on the master a bit less than
a month ago, so I don't expect huge merging conflicts. I'd suggest
rebasing it first on the top of the current master and then doing the
merge. I also found some minor drawing issues while testing around a
week ago and have no idea of someone else hasn't already fixed them:
- arcs disappear at higher zoom levels,
- 180 degree arcs in certain inductor symbols were not drawn at all,
- hierarchical labels disappear after moving (only become visible at
small zoom).

@Jeff: Would you like to do the rebase or should I do it (I'm a bit busy
this week, so can't promise any dates)?

Cheers,
Tom


Follow ups

References