From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26071 invoked by alias); 28 Oct 2013 22:35:33 -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 26049 invoked by uid 89); 28 Oct 2013 22:35:33 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.4 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_LOW,RP_MATCHES_RCVD,SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-pb0-f48.google.com Received: from mail-pb0-f48.google.com (HELO mail-pb0-f48.google.com) (209.85.160.48) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Mon, 28 Oct 2013 22:35:32 +0000 Received: by mail-pb0-f48.google.com with SMTP id mc17so2230532pbc.35 for ; Mon, 28 Oct 2013 15:35:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=g/JrcX1SUom9xAYdp0eLxpkckZ4JGo7iVjlUsf+waWQ=; b=H+lArDj+7cnyH0oZLKmaZgCQO5Dd5n5NL/tT+yBiu9U9Hco76oLcoWYldisWNerRVe 0lv99mHRRJtc3YJrpn0jJcrSxxDO9/7FJLyr2aQJUoN0UrgKUrffUJcqg8/eTLNkLFmh osU1RO6C46b/JJta9ffkry8owj3EP4Y/dK7PcOrHRLD2GQqaXCFcmPKmtmNtAifQ8B35 zHgMWjNRT9whlvupP/LPhrMOPTr+sKB7CSwM7ibYx1VW7bMGd+ElUliwnGVTaEHg1577 3tMZxD7Jijm4/d8YOltI5Nb8QlY+v7di6vz+w0HHes15JKetrMSZcZYTQetdYJC7HnM2 mLQw== X-Gm-Message-State: ALoCoQltoOfpVNJXrWD/o/DKG6/IPnQRW6FW4HVSnWaj7O0dwIKEwQzC5aPVTfvL0NnlpKTuJAmxsLBGH+GuXmwNOtmQHgguV31AuZ4ezs52n7vbikW9c+1bpFhpELcGrETtxX11HJ06TvPnNZRCvPpT107nk4eGjY7EEau/oifn3Bf/F4Cb25Htlk+a0nlfdZYMInL+R7Qp MIME-Version: 1.0 X-Received: by 10.66.150.41 with SMTP id uf9mr27954098pab.108.1382999729974; Mon, 28 Oct 2013 15:35:29 -0700 (PDT) Received: by 10.68.194.230 with HTTP; Mon, 28 Oct 2013 15:35:29 -0700 (PDT) In-Reply-To: <5266CCDC.6090803@redhat.com> References: <877gd5iyaz.fsf@fleche.redhat.com> <5266CCDC.6090803@redhat.com> Date: Mon, 28 Oct 2013 22:35:00 -0000 Message-ID: Subject: Re: git is live From: Cary Coutant To: Pedro Alves Cc: Tom Tromey , GDB Development , Binutils Development Content-Type: text/plain; charset=ISO-8859-1 X-IsSubscribed: yes X-SW-Source: 2013-10/txt/msg00173.txt.bz2 > Created a fresh clone from scratch: > > $ mkdir binutils-gdb > $ cd binutils-gdb > $ git clone ssh://sourceware.org/git/binutils-gdb.git src > > Then I went back to my old git repo checkout, and added a > remote pointing to the new local checkout: > > $ cd ../../my-old-git-repos-checkout-dir/src > $ git remote add binutils-gdb /local/path/to/fresh/binutils-gdb/src > $ git fetch binutils-gdb > > Now the same "does the new remote share commits/ancentry" > process ended in seconds, because it was all local, and git > started fetching the new repo/remote in a matter of seconds. > > So now I did: > > $ git remote set-url binutils-gdb ssh://sourceware.org/git/binutils-gdb.git > > to reset the remote url back to the real remote url, rather than > the temporary clone directory. > > Voila. Then I did: > > $ git fetch binutils-gdb > > once more, and that worked as expected. > > From there on, I've just been switching to by local > branches that were based on the old git mirror, and rebased > them on top of binutils-gdb/master. I got this far with no problems (thanks!), but my old branches don't seem to have any common commits with the new binutils-gdb/master. Are you doing the rebase with an explicit merge-base (e.g., "git branch new-branch binutils-gdb/master; git rebase --onto new-branch old-master old-branch")? Or should "git rebase binutils-gdb/master old-branch" work? (I'm hesitant to try that.) -cary