[gentoo-science] github and o.g.o sync

[gentoo-science] github and o.g.o sync

[Christoph Junghans]

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/

Re: [gentoo-science] github and o.g.o sync

[Kacper Kowalik]

[-- Attachment #1: Type: text/plain, Size: 645 bytes --]

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


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 900 bytes --]

Re: [gentoo-science] github and o.g.o sync

[justin]

[-- Attachment #1: Type: text/plain, Size: 909 bytes --]

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@git.overlays.gentoo.org/proj/sci.git
   pushurl = git@github.com:gentoo-science/sci.git
   pushurl = git+ssh://git@git.overlays.gentoo.org/proj/sci.git
[remote "github"]
   url = git@github.com:gentoo-science/sci.git


and do a "git pull --all".

All those who can push to both, should do "push --all".
With this there should nearly no overlap.

justin


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 302 bytes --]

Re: [gentoo-science] github and o.g.o sync

[justin]

[-- Attachment #1: Type: text/plain, Size: 716 bytes --]

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.



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 302 bytes --]