From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17972 invoked by alias); 3 May 2011 14:37:05 -0000 Received: (qmail 17873 invoked by uid 22791); 3 May 2011 14:37:04 -0000 X-SWARE-Spam-Status: No, hits=-1.7 required=5.0 tests=AWL,BAYES_00,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx.meyering.net (HELO mx.meyering.net) (82.230.74.64) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 03 May 2011 14:36:50 +0000 Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000) id 278C9600F9; Tue, 3 May 2011 16:36:49 +0200 (CEST) From: Jim Meyering To: Andreas Schwab Cc: Joel Brobecker , Tom Tromey , gdb-patches@sourceware.org Subject: Re: gdb_7_3-branch not buildable? In-Reply-To: (Andreas Schwab's message of "Tue, 03 May 2011 15:49:25 +0200") References: <878vvbkv3r.fsf@rho.meyering.net> <20110417013834.GB2388@adacore.com> <20110419150111.GA2601@adacore.com> <87iptsrrb0.fsf@rho.meyering.net> <878vunsydh.fsf@rho.meyering.net> Date: Tue, 03 May 2011 14:37:00 -0000 Message-ID: <8739kvsvem.fsf@rho.meyering.net> MIME-Version: 1.0 Content-Type: text/plain X-IsSubscribed: yes 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/msg00057.txt.bz2 Andreas Schwab wrote: > Jim Meyering writes: >> Andreas Schwab wrote: >>> 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. >> >> Why do you say that? > > So that all the commits can be properly reimported, instead of > potentially remaining broken. > >> tell us what you actually did? > > Reset the branch and rerun cvsimport. As far as I can see, all of the commits were imported into the git repository without error. The only problem is that the branch tag appeared in CVS a few days after it should have, and the intervening commits all happened to belong on the branch. At least those ~20 intervening commits just happened to represent precisely the differences I was seeing between the git and cvs versions of the 7.3 branch. Bottom line, since the desired commits were already there, and contiguous with the old base of the branch, rebasing the 7.3 branch to the earlier commit on the trunk did exactly what was required. That's why the inter-(cvs-git)-diff is now effectively empty for the 7.3 branch.