From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23208 invoked by alias); 3 May 2011 13:10:35 -0000 Received: (qmail 23042 invoked by uid 22791); 3 May 2011 13:10:34 -0000 X-SWARE-Spam-Status: No, hits=-6.3 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,SPF_HELO_PASS,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 03 May 2011 13:10:14 +0000 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p43D9s3e032039 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 3 May 2011 09:09:54 -0400 Received: from hase (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p43D9q5L027678; Tue, 3 May 2011 09:09:53 -0400 From: Andreas Schwab To: Jim Meyering Cc: Joel Brobecker , Tom Tromey , gdb-patches@sourceware.org Subject: Re: gdb_7_3-branch not buildable? References: <878vvbkv3r.fsf@rho.meyering.net> <20110417013834.GB2388@adacore.com> <20110419150111.GA2601@adacore.com> <87iptsrrb0.fsf@rho.meyering.net> X-Yow: -- I can do ANYTHING ... I can even ... SHOPLIFT!! Date: Tue, 03 May 2011 13:10:00 -0000 In-Reply-To: <87iptsrrb0.fsf@rho.meyering.net> (Jim Meyering's message of "Tue, 03 May 2011 12:50:43 +0200") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2011-05/txt/msg00053.txt.bz2 Jim Meyering writes: > # Rebase to proper branch point: > git tag gdb_7_3-2011-04-01-branchpoint c73dde705c3b163b5101ed4cc4506cef6cc58905 > git branch --track v7.3 remotes/origin/gdb_7_3-branch && git co v7.3 > git rebase --onto gdb_7_3-2011-04-01-branchpoint master v7.3 You should have reset the branch to the branchpoint, not rebase. Andreas. -- Andreas Schwab, schwab@redhat.com GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84 5EC7 45C6 250E 6F00 984E "And now for something completely different."