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: Tue, 14 Oct 2014 20:39:06 -0400 Message-ID: <31BBBD93-A468-4542-BD69-B92FF95987F1@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 7.3 \(1878.6\)) Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1413333592 17604 80.91.229.3 (15 Oct 2014 00:39:52 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 15 Oct 2014 00:39:52 +0000 (UTC) Cc: Stefan Monnier , "emacs-devel@gnu.org developers" To: esr@thyrsus.com Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Oct 15 02:39:45 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 1XeCcu-0003Sw-Nu for ged-emacs-devel@m.gmane.org; Wed, 15 Oct 2014 02:39:40 +0200 Original-Received: from localhost ([::1]:40954 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XeCcu-0005BT-Cv for ged-emacs-devel@m.gmane.org; Tue, 14 Oct 2014 20:39:40 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45824) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XeCcb-00059T-22 for emacs-devel@gnu.org; Tue, 14 Oct 2014 20:39:27 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XeCcS-0003dt-CH for emacs-devel@gnu.org; Tue, 14 Oct 2014 20:39:20 -0400 Original-Received: from mail-qc0-x232.google.com ([2607:f8b0:400d:c01::232]:56418) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XeCcS-0003dm-7D for emacs-devel@gnu.org; Tue, 14 Oct 2014 20:39:12 -0400 Original-Received: by mail-qc0-f178.google.com with SMTP id c9so169454qcz.23 for ; Tue, 14 Oct 2014 17:39:11 -0700 (PDT) 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=MInahb13jal94fZDN/uOj4UHacIZ4RKOqug2OVr+DA4=; b=rtzFKUj2eG6pVKg0r6yTtHHtu4cE7/xgckQJYPo2dW7Rc6iuuZkaMpi98pxHwOfrzY NTpwjqkC4LjGkH3Ec+kzS/XzUGm+Dv0lMXZ2rI4urHepbzGTPTydR14Mi31aF3Horxxz qXdzz9sMR9alS9QzH37DXMPDqdSrQ4zaRpDgJQvOcFZvzB44wFU+Wc600en4yIR6otYZ wXD4InOW+NZmr0UzTN/domOLDLqRxauLjyAP5fB12hD9hqkt5WYvwWgB11XEmfBjDQEV yfCc0G/87ECORHz4r8rqbxncmwT7xl5WFhH4K22YMvqf2LF2RP0ojDtpeeK5/WGkVEzt te6A== X-Received: by 10.224.50.196 with SMTP id a4mr5505280qag.88.1413333551679; Tue, 14 Oct 2014 17:39:11 -0700 (PDT) Original-Received: from [10.0.1.6] (c-71-58-212-112.hsd1.pa.comcast.net. [71.58.212.112]) by mx.google.com with ESMTPSA id j34sm8721273qge.41.2014.10.14.17.39.10 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 14 Oct 2014 17:39:10 -0700 (PDT) In-Reply-To: <20141014224926.GA18117@thyrsus.com> X-Mailer: Apple Mail (2.1878.6) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c01::232 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:175383 Archived-At: On Oct 14, 2014, at 6:49 PM, Eric S. Raymond wrote: > 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. Thank you. I am getting a little anxious about this. Do you consider = the main conversion more or less done? > 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. Yes.=20 >=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. Since the old git repo (and the one before that) are part of my repo, we = can just run it once (on mine). Do you already have version stamps for everything in the new one? > 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. I have about 370 merges, the majority of which are merges from the = mainline into one of my branches. git rev-list --merges --parents aquamacs3 --author=3Dreitter = >a3merges.txt git rev-list --merges --parents aquamacs2 --author=3Dreitter = >a2merges.txt Some of these are merges against something else than the mainline, but I = would think that your rewrite tool will leave rev-ids alone that cannot = be translated. > 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. This will definitely require your expertise=85=20 If all goes well, we should end up with the minimal repository = necessary: no duplicate contents, I hope. Right now I am carrying the first-ever git conversion of Emacs, plus the = later official git mirror, along with my own changes. I am obviously = hoping to get rid of this old baggage and just have the new one. Can I help this along by providing access to a big machine for the = transfer? - D=