Re: [Kicad-developers] Advice on merge request

2020-01-04 Thread Brian Piccioni
Eeli I have to re-create my fork based on Alexander's Gitlab fork because mine is based on his Github fork, which is a generation behind his Gitlab fork (isn't migrations wonderful?). Then I have to run it through a style checker. Once I do that (probably a few days, I'll push it out and let

Re: [Kicad-developers] Advice on merge request

2020-01-04 Thread Eeli Kaikkonen
I have already added Alexander's fork as a "remote" for my local clone of kicad. When I'm back home, I can add yours. You have already forked from Alexander - if you have a local branch based on Alexander's "backannotate" which you want to publish for testing, just push it to your remote, i.e. to y

Re: [Kicad-developers] Advice on merge request

2020-01-04 Thread Jon Evans
Hi Brian, For the first question, you could cherry-pick all the commits from Alexander's merge request onto your own feature branch (rebasing your own commits on top of his). Once his MR is merged, you can just rebase your branch on top of latest master, dropping the cherry-picked commits and just

[Kicad-developers] Advice on merge request

2020-01-04 Thread Brian Piccioni
Hello I have been working on Geographical reannotation. It uses the code Alexander Shuklin created for back annotation. I understand Alexander's merge request has been pending (yes, I know it is holidays) but now I don't know how to proceed because my code depends on his code. Any suggestion

[Kicad-developers] Issues with Github/Gitlab migration

2020-01-04 Thread Brian Piccioni
Hello I thought I would give a heads up to anybody else having this issue: I was provided with a Gitlab account which used the same login, etc., at my Github account. Although the account allowed me to examine things like Kicad source I could not clone or fork any repository: either it would

Re: [Kicad-developers] QA broken for arcs

2020-01-04 Thread jp charras
Le 03/01/2020 à 20:57, Seth Hillbrand a écrit : > Hi Folks- > > It looks like a recent commit broke the QA tests for Arc bbox checks. Commit 5707e6eac should fix this issue. > > > ../../qa/common/geometry/test_shape_arc.cpp(91): error: in > "ShapeArc/BasicCPAGeom": check KI_TEST::IsBoxWithinTo

Re: [Kicad-developers] GitLab migration

2020-01-04 Thread Rene Pöschl
What gave you the impression we were keen on moving shop? Github does everything we need it to do (unlike launchpad). My guess is that you chose gitlab over github because it can be installed on your own servers so is more future proof. (Nobody really explained why gitlab was chosen so i could