From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13349 invoked by alias); 10 Oct 2009 05:35:40 -0000 Received: (qmail 13338 invoked by uid 22791); 10 Oct 2009 05:35:39 -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-bw0-f208.google.com (HELO mail-bw0-f208.google.com) (209.85.218.208) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sat, 10 Oct 2009 05:35:35 +0000 Received: by bwz4 with SMTP id 4so2066159bwz.24 for ; Fri, 09 Oct 2009 22:35:32 -0700 (PDT) MIME-Version: 1.0 Received: by 10.103.76.37 with SMTP id d37mr1423627mul.99.1255152932313; Fri, 09 Oct 2009 22:35:32 -0700 (PDT) In-Reply-To: <8ba6bed40910062129s1f2fa86o3ade15bb03671664@mail.gmail.com> References: <6dc9ffc80910051730p207a14f2m5ee6ff560ea60c33@mail.gmail.com> <87ws397z1b.fsf@meyering.net> <6dc9ffc80910060608u60ccf9eal72ab51f216b7f75c@mail.gmail.com> <87ocok4nvz.fsf@meyering.net> <8ba6bed40910062129s1f2fa86o3ade15bb03671664@mail.gmail.com> Date: Sat, 10 Oct 2009 05:35:00 -0000 Message-ID: <8ba6bed40910092235g67902282kf4cf753107066049@mail.gmail.com> Subject: Re: gdb.git mirror is broken From: Matt Rice To: GDB Content-Type: text/plain; charset=ISO-8859-1 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/msg00190.txt.bz2 On Tue, Oct 6, 2009 at 9:29 PM, Matt Rice wrote: > 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, It just occurred to me that when merging from the large combined tree back into the split out subtrees, assuming that these simply track the main tree and nobody is given write access I believe we can safely $ git fetch binutils $ git rebase -s subtree binutils/master instead of the $ git merge -s subtree binutils/master without worrying about rebase rewriting commits, since it is strictly a sink. instead of git merge -s subtree and avoid all of these merge commits