From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.77) (envelope-from ) id 1Sn4S1-0007ph-Vy for garchives@archives.gentoo.org; Fri, 06 Jul 2012 09:03:46 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C0FFB21C013 for ; Fri, 6 Jul 2012 09:03:44 +0000 (UTC) Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com [209.85.217.181]) by pigeon.gentoo.org (Postfix) with ESMTP id 70D7BE06D6 for ; Fri, 6 Jul 2012 07:51:29 +0000 (UTC) Received: by lbbgk8 with SMTP id gk8so13670632lbb.40 for ; Fri, 06 Jul 2012 00:51:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject:references :in-reply-to:x-enigmail-version:content-type; bh=vLkwTn1MiebySpUB6zrMKAffcbkg5iUD3HplRHkvtIY=; b=sxz+8L5e+2+XpoKEHdBgb9GSNd94+RAwoKG9bbPyDKFaiSyfZUzmkbaCk9G4U5FZqP 1SkzEDl2yD+KkFw5ssrNsAD+ls6vrJkaWCRkc6kTk+Y0COzdBqZeVbINpN2NjpxU0IzD a3OhPpxGMy26+mHIMyxoSppymOjqTXo3YsTyCRbw2pNC8xR3whDb3iy4NChbyeLYRmry pmCgD/tnjTK7CGycSEFFdIqktvdJqUD1z0CYDIGNc/SP7cs3gqiNkP89IKb7ECfLQsL+ XpxMQIF6r4BN6zWe+Vu6r/Z2pd3TfqxlTuWVwa6+buZDY4yOxebnLxQ5fWmsR+BTENQF 6deg== Received: by 10.112.83.169 with SMTP id r9mr13008173lby.66.1341561088255; Fri, 06 Jul 2012 00:51:28 -0700 (PDT) Received: from [192.168.0.101] ([82.160.3.76]) by mx.google.com with ESMTPS id gd9sm14691175lbb.15.2012.07.06.00.51.27 (version=SSLv3 cipher=OTHER); Fri, 06 Jul 2012 00:51:27 -0700 (PDT) Message-ID: <4FF698FB.6040501@gmail.com> Date: Fri, 06 Jul 2012 09:51:23 +0200 From: Kacper Kowalik User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:13.0) Gecko/20120612 Thunderbird/13.0 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-science@lists.gentoo.org Reply-to: gentoo-science@lists.gentoo.org MIME-Version: 1.0 To: gentoo-science@lists.gentoo.org Subject: Re: [gentoo-science] github and o.g.o sync References: In-Reply-To: X-Enigmail-Version: 1.5pre Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------enig2473398388C888473FCB7CC3" X-Archives-Salt: e6bf455e-415b-444a-977e-d4975d9e6492 X-Archives-Hash: 328b73f8c71c07c31b71043d9b512cfb This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig2473398388C888473FCB7CC3 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On 07/05/2012 10:46 PM, Christoph Junghans wrote: > Hi, >=20 > 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) >=20 > 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 --------------enig2473398388C888473FCB7CC3 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQIcBAEBCAAGBQJP9pkDAAoJEF0huFKJUZL5YdMP/A2Nd46OQs0dVZWhUyIj5Bz6 y+oTwqWoGj0qmGPYvqa+DXi3ZyQi89IaimdtudxHFhXhiDc3bgCbfAJpqICvzS8k v0585+JZvvppdf3kih/TRFPoQnJQEld+pH6nZUVdxBEgvJATMqEHmzwllgMlw/i/ HSSWyLtW2HliT5Rh51VKbF7ATtAGMA7vKi701702FGR8ZNuJ1zwdt7eGpcHSgmZo oyi9TafNV9aX8UxHkCzD3TTB+61ey+TmOve1v0wWz9IOH/7w9vz7HpPUGGL4s19m 6tSDGDo7PwGmD5iB6pAL1Yg0dxcR5pdVcUj3xgMAtCQqaRA44AEYP7KtAXUmRBQR ZcWKMBYAUS/8J8HP33d5n/zBXZX4AZUYO/s0tUhUrqIdEGzI3m4iVaXqpdRnCfpv 5sSTSQXecmUTrnR7CgfxSGAGR0dlRgPQxIqhKMVYZ3GHrO2f8Ct8MDLjv/q4q3I/ gSA89dAf3APqoWEXCuHksYjJSRj1vDwDWBO0OE44yDSzjdpI9oVPkgB4RQRWkb+K FII5lxcICIa5sbMGNvEDhR9i6ypFCxLzE4cmgB0D0H3NAaXH7svWr7E04j3VFg8e T6C4GGk25nNpd05lW6cYxwn40QXHgjf1X898UvFtFjVhCGjtJHTmjxNOJQviLgwz 8jsCFX4t2d7m8k7Qtq3W =jcjR -----END PGP SIGNATURE----- --------------enig2473398388C888473FCB7CC3--