kicad-developers team mailing list archive

[Niki Guldbrand <niki.guldbrand@xxxxxxxxx>]

Hi Wayne.

My git repo contains all the tags from bzr all ready.

On tir, 2016-08-23 at 10:16 -0400, Wayne Stambaugh wrote:
> It should.  Anyone on the kicad-product-committers team has write
> access
> to lp:kicad.  Since I need to figure out how to do this, I'll give it
> one more try before I throw in the towel.  I just ran `git tag` and
> there are no tags in our git repo.  I thought the bzr tags got
> translated to git tags by the github mirror.  Apparently this is not
> the
> case which means that I will have to manually find the point where we
> branched from bzr 4.0.0-rc1 in the git repo and create a branch from
> that point.  From there, I should be able to pull Niki's 4.0.x branch
> cleanly.  This is already becoming way more work than it needs to be.
> 
> On 8/23/2016 10:06 AM, Chris Pavlina wrote:
> > 
> > How about I just do this? I think it'll let me push new branches...
> > 
> > 
> > On Aug 23, 2016 09:58, "Shane Burrell" <shaneb@xxxxxxxxxxxxxxxx
> > <mailto:shaneb@xxxxxxxxxxxxxxxx>> wrote:
> > 
> >     If you really trust the branch and aren't concerned about
> > history
> >     (prolly messy anyways), just create a stable branch in your
> > repo,
> >     and checkout a clean from the remote to overlay your stable
> > branch
> >     and push that.  More of a replace than a merge.  That's likely
> > the
> >     cleanest way to do it.  It would be good to create standard
> > branches
> >     of develop, release etc as defined in the link sent earlier.  
> > 
> >     On Tue, Aug 23, 2016 at 9:42 AM, Mark Roszko <mark.roszko@gmail
> > .com
> >     <mailto:mark.roszko@xxxxxxxxx>> wrote:
> > 
> >         I forgot to add, if you trust the divergent branch (because
> > I
> >         imagine
> >         its cherry-picked commits etc from master).
> > 
> >         Then just do a git checkout and specify niki's branch from
> > the
> >         remote
> >         and a local branch name in the command line. Then push that
> > branch.
> >         This will combine the two.
> > 
> >         _______________________________________________
> >         Mailing list: https://launchpad.net/~kicad-developers
> >         <https://launchpad.net/~kicad-developers>
> >         Post to     : kicad-developers@xxxxxxxxxxxxxxxxxxx
> >         <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx>
> >         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@xxxxxxxxxxxxxxxxxxx
> >     <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx>
> >     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@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
> Unsubscribe : https://launchpad.net/~kicad-developers
> More help   : https://help.launchpad.net/ListHelp