From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12155 invoked by alias); 29 Oct 2013 01:53:54 -0000 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 Received: (qmail 11978 invoked by uid 89); 29 Oct 2013 01:53:53 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.6 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 29 Oct 2013 01:53:52 +0000 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r9T1rowJ029240 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 28 Oct 2013 21:53:50 -0400 Received: from barimba (ovpn-113-94.phx2.redhat.com [10.3.113.94]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r9T1rnC7029011 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Mon, 28 Oct 2013 21:53:49 -0400 From: Tom Tromey To: Cary Coutant Cc: Pedro Alves , GDB Development , Binutils Development Subject: Re: git is live References: <877gd5iyaz.fsf@fleche.redhat.com> <5266CCDC.6090803@redhat.com> Date: Tue, 29 Oct 2013 01:53:00 -0000 In-Reply-To: (Cary Coutant's message of "Mon, 28 Oct 2013 15:35:29 -0700") Message-ID: <87iowgalle.fsf@fleche.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-SW-Source: 2013-10/txt/msg00175.txt.bz2 Cary> I got this far with no problems (thanks!), but my old branches don't Cary> seem to have any common commits with the new binutils-gdb/master. Are Cary> you doing the rebase with an explicit merge-base (e.g., "git branch Cary> new-branch binutils-gdb/master; git rebase --onto new-branch Cary> old-master old-branch")? Or should "git rebase binutils-gdb/master Cary> old-branch" work? (I'm hesitant to try that.) You want git rebase --onto. I did it using "git format-patch" followed by "git am" the first time. The second time I did Pedro's approach and used "git rebase --onto". Both of these worked great, though some manual labor is needed. (Actually the second time I wrote a script to automate it: using git merge-base to find the root of a branch and then looking up the corresponding commit in the new tree -- but for reasons I don't know it only worked for about half of my branches.) Tom