Re: [gentoo-science] overlay and github out of sync
Hi François, On 09/17/2015 10:58 PM, François Bissey wrote: > Hi all, > > The overlay and the github repo are out of sync again. > marbre has pushed some changes about the ipython 4 > stack about 24 hours ago and they still aren't visible > in the overlay. > > I don't have push credentials to the overlay anymore > (at least it didn't work last time I tried) so > someone else has to do it. > > Francois > done. -- Jauhien signature.asc Description: OpenPGP digital signature
Re: [gentoo-science] overlay and github out of sync
On 09/18/15 08:58, François Bissey wrote: > Hi all, > > The overlay and the github repo are out of sync again. > marbre has pushed some changes about the ipython 4 > stack about 24 hours ago and they still aren't visible > in the overlay. > > I don't have push credentials to the overlay anymore > (at least it didn't work last time I tried) so > someone else has to do it. > > Francois > Note to sage-on-gentoo users using the sage- ebuild, because the overlay is not synchronized you may need to merge wxpython. It is not technically needed but the current ipython ebuild will force you to do it. Once the overlay is synchronized with github the requirement for wxpython will go away. Francois
Re: [gentoo-science] overlay and github out of sync
On 09/18/15 10:02, Jauhien Piatlicki wrote: > Hi François, > > On 09/17/2015 10:58 PM, François Bissey wrote: >> Hi all, >> >> The overlay and the github repo are out of sync again. >> marbre has pushed some changes about the ipython 4 >> stack about 24 hours ago and they still aren't visible >> in the overlay. >> >> I don't have push credentials to the overlay anymore >> (at least it didn't work last time I tried) so >> someone else has to do it. >> >> Francois >> > > done. > Thanks a lot! Francois
Re: [gentoo-science] overlay and github out of sync again
On 02/07/14 23:25, François Bissey wrote: On Wed, 02 Jul 2014 15:12:27 Justin wrote: On 02/07/14 13:32, Jauhien Piatlicki wrote: Hi, On 07/02/2014 01:19 PM, François Bissey wrote: Consider that I am the village idiot, you have to explain to me how you integrated the two branches that each had a commit that the other didn’t have. quite simple ;-) consider you have two branches in your local repo: github-master and gentoo-master, and you have two remotes: github and gentoo. Then you do something like: git checkout github-master git pull git checkout gentoo-master git pull Now your local branches are in sync with remote, you can do merging git checkout github-master git merge gentoo-master git push github github-master:master git checkout gentoo-master git merge github-master git push gentoo gentoo-master:master You can do it with less commands, but I've written it this way, so everything should be completely clear. ) Regards, Jauhien Hey guys, as I wrote some month ago, I placed a script into the script dir called merge-dualHEAD which we can use for syncing. Can we put a note on the github wiki about it then? Because I remembered there was something on the mailing list but yes it was months ago. Possibly a couple of years even. Francois It is already there https://github.com/gentoo-science/sci/blob/master/CONTRIBUTING.md Jusitn signature.asc Description: OpenPGP digital signature
Re: [gentoo-science] overlay and github out of sync again
Hi François, On 07/02/2014 12:40 PM, François Bissey wrote: Hi, The overlay are out of sync again. When jlec merged pynomo earlier today it wasn’t pushed to the Gentoo overlay for a reason or another. And then I pushed a minor keywording for x64-macos and it did go on the Gentoo overlay but not on github. I cannot remember how to resolve the problem, do we have documentation elsewhere than on the mailing list in post several years old for that? Resolved. Just merged the changes as we anyway use merges working with pull requests. I mean, our git process is based on merges, so merging unsynced branches does not create problems. Regards, Jauhien signature.asc Description: OpenPGP digital signature
Re: [gentoo-science] overlay and github out of sync again
Hi, On 07/02/2014 01:19 PM, François Bissey wrote: Consider that I am the village idiot, you have to explain to me how you integrated the two branches that each had a commit that the other didn’t have. quite simple ;-) consider you have two branches in your local repo: github-master and gentoo-master, and you have two remotes: github and gentoo. Then you do something like: git checkout github-master git pull git checkout gentoo-master git pull Now your local branches are in sync with remote, you can do merging git checkout github-master git merge gentoo-master git push github github-master:master git checkout gentoo-master git merge github-master git push gentoo gentoo-master:master You can do it with less commands, but I've written it this way, so everything should be completely clear. ) Regards, Jauhien signature.asc Description: OpenPGP digital signature
Re: [gentoo-science] overlay and github out of sync again
On 02/07/14 13:32, Jauhien Piatlicki wrote: Hi, On 07/02/2014 01:19 PM, François Bissey wrote: Consider that I am the village idiot, you have to explain to me how you integrated the two branches that each had a commit that the other didn’t have. quite simple ;-) consider you have two branches in your local repo: github-master and gentoo-master, and you have two remotes: github and gentoo. Then you do something like: git checkout github-master git pull git checkout gentoo-master git pull Now your local branches are in sync with remote, you can do merging git checkout github-master git merge gentoo-master git push github github-master:master git checkout gentoo-master git merge github-master git push gentoo gentoo-master:master You can do it with less commands, but I've written it this way, so everything should be completely clear. ) Regards, Jauhien Hey guys, as I wrote some month ago, I placed a script into the script dir called merge-dualHEAD which we can use for syncing. Justin signature.asc Description: OpenPGP digital signature
Re: [gentoo-science] overlay and github out of sync again
On Thu, 03 Jul 2014 09:25:47 François Bissey wrote: On Wed, 02 Jul 2014 15:12:27 Justin wrote: On 02/07/14 13:32, Jauhien Piatlicki wrote: Hi, On 07/02/2014 01:19 PM, François Bissey wrote: Consider that I am the village idiot, you have to explain to me how you integrated the two branches that each had a commit that the other didn’t have. quite simple ;-) consider you have two branches in your local repo: github-master and gentoo-master, and you have two remotes: github and gentoo. Then you do something like: git checkout github-master git pull git checkout gentoo-master git pull Now your local branches are in sync with remote, you can do merging git checkout github-master git merge gentoo-master git push github github-master:master git checkout gentoo-master git merge github-master git push gentoo gentoo-master:master You can do it with less commands, but I've written it this way, so everything should be completely clear. ) Regards, Jauhien Hey guys, as I wrote some month ago, I placed a script into the script dir called merge-dualHEAD which we can use for syncing. Can we put a note on the github wiki about it then? Because I remembered there was something on the mailing list but yes it was months ago. Possibly a couple of years even. Ok only 5 months :)
