Hi Ian, Yeah, I tried just pushing the branch first, but it does the same thing. I think I need to either delete all the other branches by hand, or turn off the “mirror” property (as that might force pushing of all branches).
Cheers, Jeff. > On 26 Apr 2020, at 15:21, Ian McInerney <ian.s.mciner...@ieee.org> wrote: > > Try pushing only the branch you are actively working on to your personal repo. > > In my setup, I have 2 remotes: > 1) product - this is the main KiCad repo > 2) personal - this is my personal fork > > When I am working on a feature branch (called im/featurebranch) I push it to > my personal repo like this: > `git push personal im/featurebranch` > > Every other time I am working directly on master (such as for bug fixes or > smaller changes), I just push like this: > `git push product master` > > What is probably happening is that your fork has the main branches marked as > protected still - since they are marked as protected in the main repo the > fork copies that setting over. > > -Ian > > On Sun, Apr 26, 2020 at 3:14 PM Jeff Young <j...@rokeby.ie > <mailto:j...@rokeby.ie>> wrote: > So I set jeffyoung/kicad as a remote named “public” and set as a mirror. But > when I push to it I get a bunch of errors: > > Jeffs-MBP:kicad jeff$ git push public > Enter passphrase for key '/Users/jeff/.ssh/id_rsa': > Enumerating objects: 3601, done. > Counting objects: 100% (2535/2535), done. > Delta compression using up to 8 threads > Compressing objects: 100% (471/471), done. > Writing objects: 100% (937/937), 529.58 KiB | 8.83 MiB/s, done. > Total 937 (delta 797), reused 533 (delta 458) > remote: Resolving deltas: 100% (797/797), completed with 378 local objects. > remote: GitLab: You are not allowed to force push code to a protected branch > on this project. > To gitlab.com <http://gitlab.com/>:jeffyoung/kicad.git > ! [remote rejected] 4.0 (pre-receive hook declined) > ! [remote rejected] 5.0 -> 5.0 (pre-receive hook declined) > ! [remote rejected] 5.1 -> 5.1 (pre-receive hook declined) > ! [remote rejected] drc (pre-receive hook declined) > > This is all greek to me. Any ideas? > > Thanks, > Jeff. > > >> On 26 Apr 2020, at 14:58, Jeff Young <j...@rokeby.ie >> <mailto:j...@rokeby.ie>> wrote: >> >> Never mind. That page explains how to do the later. >> >> >>> On 26 Apr 2020, at 14:56, Jeff Young <j...@rokeby.ie >>> <mailto:j...@rokeby.ie>> wrote: >>> >>> And then the merge request, is that from jeff/kicad:jeffDRC to >>> jeff/kicad:master, or is there some way to do a merge request from >>> jeff/kicad:jeffDRC to kicad/code/kicad:master? >>> >>>> On 26 Apr 2020, at 14:50, Ian McInerney <ian.s.mciner...@ieee.org >>>> <mailto:ian.s.mciner...@ieee.org>> wrote: >>>> >>>> Jeff, >>>> >>>> From the main repository page, simply click on "Fork" at the top of the >>>> page. Then you create it inside your Personal namespace. Once you do that, >>>> the fork can just become a new remote in your git repository. >>>> >>>> https://docs.gitlab.com/ee/user/project/repository/forking_workflow.html#creating-a-fork >>>> >>>> <https://docs.gitlab.com/ee/user/project/repository/forking_workflow.html#creating-a-fork> >>>> >>>> -Ian >>>> >>>> On Sun, Apr 26, 2020 at 2:48 PM Jeff Young <j...@rokeby.ie >>>> <mailto:j...@rokeby.ie>> wrote: >>>> I don’t have a personal repo. Is it (reasonably) obvious how to create >>>> one? >>>> >>>> > On 26 Apr 2020, at 14:32, Wayne Stambaugh <stambau...@gmail.com >>>> > <mailto:stambau...@gmail.com>> wrote: >>>> > >>>> > Hi Jeff, >>>> > >>>> > Would you please move your working branch from the main repo to your >>>> > personal repo and create a merge request? This will make it much easier >>>> > to test and avoid poluting the main repo with developers personal >>>> > working branches. >>>> > >>>> > Thanks, >>>> > >>>> > Wayne >>>> > >>>> > On 4/26/20 8:27 AM, Jeff Young wrote: >>>> >> I have added code to many DRC errors which shows the minimum clearance, >>>> >> its source, and the actual clearance. >>>> >> >>>> >> The old DRC code was pretty heavily optimised around the idea of only >>>> >> needing to know if the clearance was violated (and not by how much), so >>>> >> a lot of it has been re-written. For this reason the new code is >>>> >> currently in a branch (jeffDRC). >>>> >> >>>> >> I’d appreciate some testing on it if anyone gets a chance. (More on the >>>> >> DRC errors themselves than the new reporting.) >>>> >> >>>> >> Cheers, >>>> >> Jeff. >>>> >> >>>> >> PS: feel free to report issues here in email, or >>>> >> in https://gitlab.com/kicad/code/kicad/-/issues/2313 >>>> >> <https://gitlab.com/kicad/code/kicad/-/issues/2313>. >>>> >> >>>> >> _______________________________________________ >>>> >> Mailing list: https://launchpad.net/~kicad-developers >>>> >> <https://launchpad.net/~kicad-developers> >>>> >> Post to : kicad-developers@lists.launchpad.net >>>> >> <mailto:kicad-developers@lists.launchpad.net> >>>> >> Unsubscribe : https://launchpad.net/~kicad-developers >>>> >> <https://launchpad.net/~kicad-developers> >>>> >> More help : https://help.launchpad.net/ListHelp >>>> >> <https://help.launchpad.net/ListHelp> >>>> >> >>>> > >>>> > _______________________________________________ >>>> > Mailing list: https://launchpad.net/~kicad-developers >>>> > <https://launchpad.net/~kicad-developers> >>>> > Post to : kicad-developers@lists.launchpad.net >>>> > <mailto:kicad-developers@lists.launchpad.net> >>>> > Unsubscribe : https://launchpad.net/~kicad-developers >>>> > <https://launchpad.net/~kicad-developers> >>>> > More help : https://help.launchpad.net/ListHelp >>>> > <https://help.launchpad.net/ListHelp> >>>> >>>> >>>> _______________________________________________ >>>> Mailing list: https://launchpad.net/~kicad-developers >>>> <https://launchpad.net/~kicad-developers> >>>> Post to : kicad-developers@lists.launchpad.net >>>> <mailto:kicad-developers@lists.launchpad.net> >>>> Unsubscribe : https://launchpad.net/~kicad-developers >>>> <https://launchpad.net/~kicad-developers> >>>> More help : https://help.launchpad.net/ListHelp >>>> <https://help.launchpad.net/ListHelp> >>> >>> _______________________________________________ >>> Mailing list: https://launchpad.net/~kicad-developers >>> <https://launchpad.net/~kicad-developers> >>> Post to : kicad-developers@lists.launchpad.net >>> <mailto:kicad-developers@lists.launchpad.net> >>> Unsubscribe : https://launchpad.net/~kicad-developers >>> <https://launchpad.net/~kicad-developers> >>> More help : https://help.launchpad.net/ListHelp >>> <https://help.launchpad.net/ListHelp> >> >> _______________________________________________ >> Mailing list: https://launchpad.net/~kicad-developers >> <https://launchpad.net/~kicad-developers> >> Post to : kicad-developers@lists.launchpad.net >> <mailto:kicad-developers@lists.launchpad.net> >> Unsubscribe : https://launchpad.net/~kicad-developers >> <https://launchpad.net/~kicad-developers> >> More help : https://help.launchpad.net/ListHelp >> <https://help.launchpad.net/ListHelp> >
_______________________________________________ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
