From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Reitter Newsgroups: gmane.emacs.devel Subject: Re: Emacs-24.4's release Date: Wed, 4 Feb 2015 19:31:47 -0500 Message-ID: <8EA1E52E-C298-4134-B60E-973412F90FA3@gmail.com> References: <20141014215424.GA17044@thyrsus.com> <5826765D-B430-4CCF-BA9D-B38DE1BD04C4@gmail.com> <20141014224926.GA18117@thyrsus.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2070.6\)) Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1423096325 18536 80.91.229.3 (5 Feb 2015 00:32:05 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 5 Feb 2015 00:32:05 +0000 (UTC) Cc: "emacs-devel@gnu.org developers" To: esr@thyrsus.com Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Feb 05 01:32:01 2015 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 1YJAMR-00057w-Dk for ged-emacs-devel@m.gmane.org; Thu, 05 Feb 2015 01:31:59 +0100 Original-Received: from localhost ([::1]:39506 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YJAMQ-0000fm-Ky for ged-emacs-devel@m.gmane.org; Wed, 04 Feb 2015 19:31:58 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33229) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YJAMM-0000fU-N5 for emacs-devel@gnu.org; Wed, 04 Feb 2015 19:31:55 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YJAMJ-0000rB-GR for emacs-devel@gnu.org; Wed, 04 Feb 2015 19:31:54 -0500 Original-Received: from mail-qg0-x235.google.com ([2607:f8b0:400d:c04::235]:40337) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YJAMJ-0000r1-CL for emacs-devel@gnu.org; Wed, 04 Feb 2015 19:31:51 -0500 Original-Received: by mail-qg0-f53.google.com with SMTP id f51so4002530qge.12 for ; Wed, 04 Feb 2015 16:31:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=nrv2+z4ic8I6Y7HoslfQ8LJCPtKib0mLAL/P/oAUiIM=; b=W+vNPEdlqYhUyR8vSO7gkKUaCG/+Ok+mD/OcXnOHWV5ngueGeQLZcszccSm67M7N+w OWN0r+bz6Srza+H0oz1GrXQs6CYSMY4dAsMqkLAeLPZe5V422chPFEPjZEXkKBpvJGxa zAgrg3s782SeTorrXb1fgsrN5z9VU9Fj7fs6Jr6T+tsKTcWgOvq8E4V60/fPbWhIT0o0 UWPLceaE2YttlOmoySiz2MGrXLsvcJOb+Nqzp2RSYp9YEpwLQPVAJEYdWD7ZDz7c78Js rYN5uVumfaKGaF+Veg5zm9MnKkkNX37Q8iCVu+soziOVpJ4YbwcJLP6ARgVVeEMrpIR5 waQQ== X-Received: by 10.224.37.138 with SMTP id x10mr2680961qad.4.1423096310435; Wed, 04 Feb 2015 16:31:50 -0800 (PST) Original-Received: from [10.0.1.15] (c-71-58-212-112.hsd1.pa.comcast.net. [71.58.212.112]) by mx.google.com with ESMTPSA id i63sm3293112qgf.47.2015.02.04.16.31.49 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 04 Feb 2015 16:31:49 -0800 (PST) In-Reply-To: <20141014224926.GA18117@thyrsus.com> X-Mailer: Apple Mail (2.2070.6) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c04::235 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:182417 Archived-At: Hi Eric, I=E2=80=99d like to pick up where we left off last year, now that the = dust has settled with the Emacs transition. Can we discuss how to get Aquamacs transitioned to the new repository? More info by e-mail - I sent you two e-mails earlier in the week. =20 - David > On Oct 14, 2014, at 6:49 PM, Eric S. Raymond wrote: >=20 > David Reitter : >> On Oct 14, 2014, at 5:54 PM, Eric S. Raymond wrote: >>=20 >>> I could construct one, but this is not a request that has come up >>> before. It would require a significant amount of new work. >>=20 >> Well, the thing is, I don=E2=80=99t know how to convert my downstream >> project, which has 10 years worth of its own development and regular >> merges against two version of the git mirrors, the later one quite >> official and GNU/FSF sanctioned. >=20 > Ah, right, you're the Aquamacs guy. I haven't given up on heelping = you=20 > accomplish what you want, but I didn't see a lot of point in pursuing > it util the main conversion is done. >=20 >> I might cut off all history prior to 2005, =E2=80=9Cflatten=E2=80=9D = the merges somehow (so that they lose their Emacs-side parent), and then = re-connect to the new Emacs repository with a merge right at the point = where you do the conversion. >>=20 >> This will destroy a lot of history on my end, which is lamentable. >=20 > Let's try to avoid that. >=20 > What you need, then, is a mapping from the hashes corresponding to = your > merge points to the merge points in the conversion? To, I take it, be=20= > used later when we try building a repo based on the new official git > that includes your work. >=20 > That is doable. Here's how I would approach it: >=20 > 1. Write a script that use git log to generate a file of lines > pairing each hash with its version stamp. >=20 > 2. Run it on the old git repo. Then run it on your repo. >=20 > 3. Write another little script to join these reports, using > version-stamp as a primary key. >=20 > 4. You then need to give me a list of your merge links from the > old repo - that is, all the pairs of parent/child hash pairs that > represent merges into your repository. >=20 > 5. Then we sanity-check. If either the set of parent hashes or the > set of child hashes is paired with any duplicate version stamps (very > unlikely but theoretically possible) life gets complicated. Let's > assume that doesn't happen. >=20 > 6. If life has not become complicated, we now have an unambiguous > representation of the cross-repository links as both hash pairs > and version-stamp pairs. >=20 > 7. Now (he said, taking a deep breath) we write another script. > It walks through your repository, emitting Aquamacs commits as=20 > git-import-stream objects in which some merge links (those that point = to > parents outside your branch) are version stamps rather than marks.=20 >=20 > 8. reposurgeon has a variant graft operation that can merge this > stream into a copy of the new git repo. I wrote this specifically > for your use case. > --=20 > Eric S. = Raymond