Discussion on science-related applications and integration in Gentoo.

Christoph Junghans | 5 Jul 2012 22:46

github and o.g.o sync

Hi,

recently it happened to me that the sci overlay on github and o.g.o
got out of sync.
(timcera pushed to github only and I pushed to o.g.o first and then
the push to the 2nd url failed)

I really think we should autosync them as with more pull request this
situation will get more likely.

Cheers,

Christoph

--

-- 
Christoph Junghans
http://dev.gentoo.org/~ottxor/

headers

Kacper Kowalik | 6 Jul 2012 09:51

Re: github and o.g.o sync

On 07/05/2012 10:46 PM, Christoph Junghans wrote:
> Hi,
> 
> recently it happened to me that the sci overlay on github and o.g.o
> got out of sync.
> (timcera pushed to github only and I pushed to o.g.o first and then
> the push to the 2nd url failed)
> 
> I really think we should autosync them as with more pull request this
> situation will get more likely.
To my knowledge it's impossible to sync two rw git repos. All severe
conflicts need manual resolution, the trival ones are delt with git
push/pull --all already.
Both repos were out of sync just a momement ago, but it was "fixable" in
the usual way.
Cheers,
Kacper

headers

justin | 6 Jul 2012 11:15

Re: github and o.g.o sync

On 06/07/12 09:51, Kacper Kowalik wrote:
> On 07/05/2012 10:46 PM, Christoph Junghans wrote:
>> Hi,
>>
>> recently it happened to me that the sci overlay on github and o.g.o
>> got out of sync.
>> (timcera pushed to github only and I pushed to o.g.o first and then
>> the push to the 2nd url failed)
>>
>> I really think we should autosync them as with more pull request this
>> situation will get more likely.
> To my knowledge it's impossible to sync two rw git repos. All severe
> conflicts need manual resolution, the trival ones are delt with git
> push/pull --all already.
> Both repos were out of sync just a momement ago, but it was "fixable" in

fixable -> octupus

I love that term.

headers

justin | 6 Jul 2012 10:01

Re: github and o.g.o sync

On 05/07/12 22:46, Christoph Junghans wrote:
> Hi,
> 
> recently it happened to me that the sci overlay on github and o.g.o
> got out of sync.
> (timcera pushed to github only and I pushed to o.g.o first and then
> the push to the 2nd url failed)
> 
> I really think we should autosync them as with more pull request this
> situation will get more likely.
> 
> Cheers,
> 
> Christoph
> 

Hi,

everybody should add both locations:

[remote "origin"]
   fetch = +refs/heads/*:refs/remotes/origin/*
   url = git+ssh://git <at> git.overlays.gentoo.org/proj/sci.git
   pushurl = git <at> github.com:gentoo-science/sci.git
   pushurl = git+ssh://git <at> git.overlays.gentoo.org/proj/sci.git
[remote "github"]
   url = git <at> github.com:gentoo-science/sci.git

and do a "git pull --all".

(Continue reading)