From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Kenneth Raeburn Newsgroups: gmane.emacs.devel Subject: Re: Switching from old git tree Date: Sat, 15 Nov 2014 03:43:05 -0500 Message-ID: References: <87ioiiotwx.fsf@fencepost.gnu.org> <87egt5q46l.fsf@fencepost.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1416041008 7690 80.91.229.3 (15 Nov 2014 08:43:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 15 Nov 2014 08:43:28 +0000 (UTC) To: "emacs-devel@gnu.org discussions" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 15 09:43:19 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XpYww-0003Ol-QZ for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 09:43:18 +0100 Original-Received: from localhost ([::1]:39488 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpYww-0001N4-EQ for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 03:43:18 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45279) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpYwg-0001Mo-Da for emacs-devel@gnu.org; Sat, 15 Nov 2014 03:43:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpYwb-000887-B2 for emacs-devel@gnu.org; Sat, 15 Nov 2014 03:43:02 -0500 Original-Received: from mail-qg0-f45.google.com ([209.85.192.45]:55011) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpYwb-000883-6w for emacs-devel@gnu.org; Sat, 15 Nov 2014 03:42:57 -0500 Original-Received: by mail-qg0-f45.google.com with SMTP id z107so12937435qgd.4 for ; Sat, 15 Nov 2014 00:42:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:content-type:mime-version:subject:from :in-reply-to:date:content-transfer-encoding:message-id:references:to; bh=bMemCxievgy5B+dFYeBmlyU/FLHeCcVxLwkEC9e0UhA=; b=EDz64usb4zsbqD4/bvHgU3gZafDJiMi1cpzqNobdlF4NcuZxD3ZY+QJmpFcfu3yaTG qS5FIdPub2jGH3/oUSAQDPJU1+XcBNTSU3BHrfLQrm+RqyyfhGWWSrok38NoqQZfVbSd 4wkvXctVkkxR14BYnLbux3NCeFiA6aBBJHgnLtBmPfW3muPXMcSymdjWrbQM19+J2mwB 5Jgdzt5M/jcsJkY5EEJDv82RLNsds03/StjwQz0IspXa/T0j5+9KTvx2KwacGr/d2J8p KxT75JeMcORBqCCyE33JQ8Wvl1VjbD5Drcdzic7I+OlUE8fEAx9ZY85XuZ6Be4ppvJIX 2eAg== X-Gm-Message-State: ALoCoQlYnsS93WoaMwCiPmrWCCjPhJ9CPt+ouj/s9fQeOiY+GfTpPGmkliQeN3zxez61+hZ2ioRx X-Received: by 10.224.88.193 with SMTP id b1mr17655755qam.30.1416040976055; Sat, 15 Nov 2014 00:42:56 -0800 (PST) Original-Received: from [192.168.17.111] (c-66-31-203-101.hsd1.ma.comcast.net. [66.31.203.101]) by mx.google.com with ESMTPSA id f65sm27885762qgf.41.2014.11.15.00.42.54 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 15 Nov 2014 00:42:55 -0800 (PST) In-Reply-To: <87egt5q46l.fsf@fencepost.gnu.org> X-Mailer: Apple Mail (2.1878.6) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.192.45 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:177151 Archived-At: On Nov 14, 2014, at 08:53, David Kastrup wrote: > Sven Axelsson writes: >=20 >> On 14 November 2014 13:20, David Kastrup wrote: >>> peder@news.klingenberg.no (Peder O. Klingenberg) writes: >>>=20 >>>> I have been using the old git-mirror for a while. In there, I have = a >>>> branch with some local modifications. >>>>=20 >>>> I understand that I need to check out a fresh tree now after the >>>> conversion? What is the smoothest way of integrating my local = branch in >>>> this new tree? I'm a very basic git user, and the only way I can = think >>>> of is to extract the patches from my old branch and applying them = by >>>> hand in the new tree. >>>=20 >>> Using git format-patch and git am, rather than git diff and git = apply. >>>=20 >>>> Is there something else I should be doing instead? >>>=20 >>> I don't think there is much of an option to do something else. >>=20 >> I suppose you could add your old repo as a local remote to the new = one, and >> cherry-pick your commits, i.e.: >>=20 >> git remote add old /local/path/to/old >> # Fetch the data to your new repo >> git fetch old >> # Find the commits to pick somehow >> git log old/master >> # Copy to new repo >> git cherry-pick >=20 > Well, I was trying to avoid the "double your repository size or no = money > back" effect. While the file and tree blobs in two differently > converted Emacs repositories are presumably pretty much the same, the > entire commit history is disjoint. I just used this approach for a few of my smaller trees: After creating = your "main" clone of the new upstream repository, clone *that* one = locally (use the "-s" option to save disk space), then use "git remote = add" and cherry-pick as above (or rebase if you prefer), and when = finished, push the updated branch(es) back into your main repository, = and delete the temporary repository used for the merging process. More complicated local trees (I've got development branches that forked, = and multiple merges from upstream or between branches) are harder; = rebase *might* be up to the job, but I suspect I'm going to be = experimenting with "git filter-branch" a bit... Ken