From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13718 invoked by alias); 7 Oct 2009 04:29:13 -0000 Received: (qmail 13710 invoked by uid 22791); 7 Oct 2009 04:29:12 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SARE_MSGID_LONG40,SPF_PASS X-Spam-Check-By: sourceware.org Received: from mail-fx0-f225.google.com (HELO mail-fx0-f225.google.com) (209.85.220.225) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 07 Oct 2009 04:29:08 +0000 Received: by fxm25 with SMTP id 25so4222952fxm.0 for ; Tue, 06 Oct 2009 21:29:06 -0700 (PDT) MIME-Version: 1.0 Received: by 10.103.84.30 with SMTP id m30mr1097020mul.23.1254889746257; Tue, 06 Oct 2009 21:29:06 -0700 (PDT) In-Reply-To: References: <6dc9ffc80910051730p207a14f2m5ee6ff560ea60c33@mail.gmail.com> <87ws397z1b.fsf@meyering.net> <6dc9ffc80910060608u60ccf9eal72ab51f216b7f75c@mail.gmail.com> <87ocok4nvz.fsf@meyering.net> Date: Wed, 07 Oct 2009 04:29:00 -0000 Message-ID: <8ba6bed40910062129s1f2fa86o3ade15bb03671664@mail.gmail.com> Subject: Re: gdb.git mirror is broken From: Matt Rice To: "Joseph S. Myers" Cc: Jim Meyering , "H.J. Lu" , Tom Tromey , GDB Content-Type: multipart/mixed; boundary=0016e65c7bc48ed853047550c9e4 X-IsSubscribed: yes Mailing-List: contact gdb-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-owner@sourceware.org X-SW-Source: 2009-10/txt/msg00126.txt.bz2 --0016e65c7bc48ed853047550c9e4 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Content-length: 1594 On Tue, Oct 6, 2009 at 7:26 AM, Joseph S. Myers w= rote: > > First and foremost, as I said in > , version control > should make common tasks easy. =A0That means a single command in a binuti= ls > checkout to commit both a BFD change and the testcases in the ld > testsuite, for example. =A0What things look like underneath is less > important, and the exact spelling of the command is less important - but > if it doesn't look like a single repository for common use cases like > that, something is seriously wrong. here is one way we could achieve the 'single commit across bfd and ld testsuite' case, by splitting bfd out, then subtree-merging it back in, then doing a subtree merge to the separated bfd, when binutils changes... one of the downsides to this is it is going to create alot of merge commits which looks kind of funky in the separated bfd's gitk, but assuming that we don't give anybody write access to the separated bfd, we could do this automatically and assume there will be no conflicts I imagine.... this script takes quite a while to run (for the initial splitting) and a bit of disk space... If we want to keep gdb in both the binutils and the separate module though that creates some things to decide like which version is the canonical one which developers should commit to, unless people feel like merging it by hand... the subtree merge isn't really something i'm that terribly familiar with, but it seems to work, i haven't done a whole lot of repository verification though. --0016e65c7bc48ed853047550c9e4 Content-Type: application/x-sh; name="git-split.sh" Content-Disposition: attachment; filename="git-split.sh" Content-Transfer-Encoding: base64 X-Attachment-Id: f_g0hkheo00 Content-length: 3449 IyEvYmluL3NoCnNldCAtbyBub3Vuc2V0CnNldCAtbyBlcnJleGl0CkdJVF9E SVI9JEhPTUUvZ2l0LwoKIyB0aGUgZmlyc3QgMyBibG9icyBvZiBzaGVsbCBj b21tYW5kcyBjYW4gYmUgcnVuIGluIHBhcmFsbGVsLCBpZgojIEkgd2VyZSB0 aGlua2luZyBJIHdvdWxkIGhhdmUgd3JpdHRlbiBhIG1ha2VmaWxlLi4uCmNk ICRHSVRfRElSCiNzcGxpdCBsaWJpYmVydHkgaW50byBpdHMgb24gcmVwby4K Z2l0IGNsb25lIC0tbm8taGFyZGxpbmtzIGJpbnV0aWxzIGxpYmliZXJ0eSAK Y2QgJEdJVF9ESVIvbGliaWJlcnR5CmdpdCBmaWx0ZXItYnJhbmNoIC0tdGFn LW5hbWUtZmlsdGVyIGNhdCAtLXN1YmRpcmVjdG9yeS1maWx0ZXIgbGliaWJl cnR5IC0tIC0tYWxsCiNzaHJpbmsgdGhlIHJlcG8uLi4KZ2l0IGZvci1lYWNo LXJlZiAtLWZvcm1hdD0iJShyZWZuYW1lKSIgcmVmcy9vcmlnaW5hbC8gfCB4 YXJncyAtbiAxIGdpdCB1cGRhdGUtcmVmIC1kCmdpdCByZWZsb2cgZXhwaXJl IC0tZXhwaXJlPW5vdyAtLWFsbApnaXQgZ2MgLS1wcnVuZT1ub3cKCiNzcGxp dCBiZmQgaW50byBpdHMgb24gcmVwby4KY2QgJEdJVF9ESVIKZ2l0IGNsb25l IC0tbm8taGFyZGxpbmtzIGJpbnV0aWxzIGJmZApjZCAkR0lUX0RJUi9iZmQK Z2l0IGZpbHRlci1icmFuY2ggLS10YWctbmFtZS1maWx0ZXIgY2F0IC0tc3Vi ZGlyZWN0b3J5LWZpbHRlciBiZmQgLS0gLS1hbGwKI3NocmluayB0aGUgcmVw by4uLgpnaXQgZm9yLWVhY2gtcmVmIC0tZm9ybWF0PSIlKHJlZm5hbWUpIiBy ZWZzL29yaWdpbmFsLyB8IHhhcmdzIC1uIDEgZ2l0IHVwZGF0ZS1yZWYgLWQK Z2l0IHJlZmxvZyBleHBpcmUgLS1leHBpcmU9bm93IC0tYWxsCmdpdCBnYyAt LXBydW5lPW5vdwoKI3JlbW92ZSBiZmQvbGliaWJlcnR5IGZyb20gYmludXRp bHMgcmVwby4KY2QgJEdJVF9ESVIKZ2l0IGNsb25lIC0tbm8taGFyZGxpbmtz IGJpbnV0aWxzIGJpbnV0aWxzLXNwbGl0CmNkICRHSVRfRElSL2JpbnV0aWxz LXNwbGl0CmdpdCBmaWx0ZXItYnJhbmNoIC0tdGFnLW5hbWUtZmlsdGVyIGNh dCAtLWluZGV4LWZpbHRlciAnZ2l0IHJtIC0tY2FjaGVkIC0taWdub3JlLXVu bWF0Y2ggYmZkIGxpYmliZXJ0eSAtcicgLS0gLS1hbGwKCgojbWVyZ2UgbGli aWJlcnR5IGJhY2sgaW4gdG8gYmludXRpbHMKY2QgJEdJVF9ESVIvCmdpdCBj bG9uZSAtLW5vLWhhcmRsaW5rcyBiaW51dGlscy1zcGxpdCBiaW51dGlscy1t ZXJnZQpjZCAkR0lUX0RJUi9iaW51dGlscy1tZXJnZSAKZ2l0IHJlbW90ZSBh ZGQgLWYgbGliaWJlcnR5ICRHSVRfRElSL2xpYmliZXJ0eQpnaXQgbWVyZ2Ug LXMgb3VycyAtLW5vLWNvbW1pdCBsaWJpYmVydHkvbWFzdGVyCmdpdCByZWFk LXRyZWUgLS1wcmVmaXg9bGliaWJlcnR5IC11IGxpYmliZXJ0eS9tYXN0ZXIK Z2l0IGNvbW1pdCAtbSAiTWVyZ2UgbGliaWJlcnR5IGFzIG91ciBzdWJkaXJl Y3RvcnkiCgojbWVyZ2UgYmZkIGJhY2sgaW4gdG8gYmludXRpbHMKZ2l0IHJl bW90ZSBhZGQgLWYgYmZkICRHSVRfRElSL2JmZApnaXQgbWVyZ2UgLXMgb3Vy cyAtLW5vLWNvbW1pdCBiZmQvbWFzdGVyCmdpdCByZWFkLXRyZWUgLS1wcmVm aXg9YmZkIC11IGJmZC9tYXN0ZXIKZ2l0IGNvbW1pdCAtbSAiTWVyZ2UgYmZk IGFzIG91ciBzdWJkaXJlY3RvcnkiCgoKI3Rlc3QgYWRkaW5nIGEgbmV3IGZp bGUgdG8gbGliaWJlcnR5LiAKY2QgJEdJVF9ESVIKZ2l0IGNsb25lIC0tbm8t aGFyZGxpbmtzIGJpbnV0aWxzLW1lcmdlIGJpbnV0aWxzLW1lcmdlLXRlc3QK Y2QgJEdJVF9ESVIvYmludXRpbHMtbWVyZ2UtdGVzdC9saWJpYmVydHkKY2F0 ID5mb28udHh0IDw8IEZPT19FT0YKdGVzdCBtZXJnaW5nIGEgbmV3IGZpbGUu Li4KRk9PX0VPRgpnaXQgYWRkIGZvby50eHQKZ2l0IGNvbW1pdCAtYSAtbSAi QWRkIGEgbmV3IGZpbGUiCgoKI21lcmdlIGJhY2sgaW4gbmV3IGZpbGUgYmFj ayBpbnRvIGxpYmliZXJ0eS4KY2QgJEdJVF9ESVIKZ2l0IGNsb25lIGxpYmli ZXJ0eSBsaWJpYmVydHktdGVzdApjZCAkR0lUX0RJUi9saWJpYmVydHktdGVz dApnaXQgcmVtb3RlIGFkZCAtZiBiaW51dGlscyAkR0lUX0RJUi9iaW51dGls cy1tZXJnZS10ZXN0CmdpdCBtZXJnZSAtcyBzdWJ0cmVlIGJpbnV0aWxzL21h c3RlcgoKI3Rlc3QgY2hhbmdpbmcgZmlsZXMgaW4gbGliaWJlcnR5CiNleGlz dGluZyBhbmQgbmV3IGZpbGVzIG91dHNpZGUgb2YgbGliaWJlcnR5LgpjZCAk R0lUX0RJUi9iaW51dGlscy1tZXJnZS10ZXN0L2xpYmliZXJ0eQpjYXQgPmZv by50eHQgPDwgRk9PX0VPRgp0ZXN0MiAuLi4KRk9PX0VPRgpjZCAkR0lUX0RJ Ui9iaW51dGlscy1tZXJnZS10ZXN0CmNhdCA+Zm9vLnR4dCA8PCBGT09fRU9G CnNob3VsZG4ndCBzaG93IHVwCkZPT19FT0YKCmNhdCA+PkNoYW5nZUxvZyA8 PENIQU5HRUxPR19FT0YKZm9vCkNIQU5HRUxPR19FT0YKCmdpdCBhZGQgZm9v LnR4dApnaXQgY29tbWl0IC1hIC1tICJ0ZXN0MiIKCmNkICRHSVRfRElSL2xp YmliZXJ0eS10ZXN0CmdpdCBmZXRjaCBiaW51dGlscwpnaXQgbWVyZ2UgLXMg c3VidHJlZSBiaW51dGlscy9tYXN0ZXIK --0016e65c7bc48ed853047550c9e4--