From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Jan D." Newsgroups: gmane.emacs.devel Subject: Re: Emacs-24.4's release Date: Thu, 05 Feb 2015 15:56:10 +0100 Message-ID: <54D3848A.3050709@swipnet.se> References: <20141014215424.GA17044@thyrsus.com> <5826765D-B430-4CCF-BA9D-B38DE1BD04C4@gmail.com> <20141014224926.GA18117@thyrsus.com> <8EA1E52E-C298-4134-B60E-973412F90FA3@gmail.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1423148346 30767 80.91.229.3 (5 Feb 2015 14:59:06 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 5 Feb 2015 14:59:06 +0000 (UTC) Cc: "emacs-devel@gnu.org developers" To: David Reitter , esr@thyrsus.com Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Feb 05 15:59: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 1YJNtU-0001rC-RU for ged-emacs-devel@m.gmane.org; Thu, 05 Feb 2015 15:59:00 +0100 Original-Received: from localhost ([::1]:42528 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YJNtP-0007sZ-F8 for ged-emacs-devel@m.gmane.org; Thu, 05 Feb 2015 09:58:55 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36832) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YJNqx-0004A5-S5 for emacs-devel@gnu.org; Thu, 05 Feb 2015 09:56:25 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YJNqu-0005jj-FT for emacs-devel@gnu.org; Thu, 05 Feb 2015 09:56:23 -0500 Original-Received: from mailfe05.swip.net ([212.247.154.129]:59496 helo=swip.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YJNqt-0005gd-U7 for emacs-devel@gnu.org; Thu, 05 Feb 2015 09:56:20 -0500 X-T2-Spam-Status: No, hits=0.8 required=5.0 tests=BAYES_50 Original-Received: from hosdjarv.se (account mj138573@tele2.se [46.59.42.57] verified) by mailfe05.swip.net (CommuniGate Pro SMTP 5.4.4) with ESMTPA id 566068389; Thu, 05 Feb 2015 15:56:14 +0100 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 In-Reply-To: <8EA1E52E-C298-4134-B60E-973412F90FA3@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 212.247.154.129 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:182450 Archived-At: Hi. A while back there was some copyright discussion when I took some code from Aquamacs, so I don't do that anymore. Has this been resolved, i.e. has all contributors to Aquamacs signed papers? Jan D. David Reitter skrev den 2015-02-05 01:31: > Hi Eric, > > I’d 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. > > - David > > > > >> On Oct 14, 2014, at 6:49 PM, Eric S. Raymond wrote: >> >> David Reitter : >>> On Oct 14, 2014, at 5:54 PM, Eric S. Raymond wrote: >>> >>>> I could construct one, but this is not a request that has come up >>>> before. It would require a significant amount of new work. >>> >>> Well, the thing is, I don’t 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. >> >> Ah, right, you're the Aquamacs guy. I haven't given up on heelping you >> accomplish what you want, but I didn't see a lot of point in pursuing >> it util the main conversion is done. >> >>> I might cut off all history prior to 2005, “flatten” 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. >>> >>> This will destroy a lot of history on my end, which is lamentable. >> >> Let's try to avoid that. >> >> 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 >> used later when we try building a repo based on the new official git >> that includes your work. >> >> That is doable. Here's how I would approach it: >> >> 1. Write a script that use git log to generate a file of lines >> pairing each hash with its version stamp. >> >> 2. Run it on the old git repo. Then run it on your repo. >> >> 3. Write another little script to join these reports, using >> version-stamp as a primary key. >> >> 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. >> >> 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. >> >> 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. >> >> 7. Now (he said, taking a deep breath) we write another script. >> It walks through your repository, emitting Aquamacs commits as >> git-import-stream objects in which some merge links (those that point to >> parents outside your branch) are version stamps rather than marks. >> >> 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. >> -- >> Eric S. Raymond >