From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: esr@thyrsus.com (Eric S. Raymond) Newsgroups: gmane.emacs.devel Subject: Trying to graft the Aquamacs branch Date: Fri, 28 Mar 2014 14:06:57 -0400 (EDT) Message-ID: <20140328180657.DC5DB380492@snark.thyrsus.com> NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1396030063 23724 80.91.229.3 (28 Mar 2014 18:07:43 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 28 Mar 2014 18:07:43 +0000 (UTC) Cc: emacs-devel@gnu.org To: David Reitter , ":"@thyrsus.com Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Mar 28 19:07:54 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 1WTbC3-0003I2-Tq for ged-emacs-devel@m.gmane.org; Fri, 28 Mar 2014 19:07:52 +0100 Original-Received: from localhost ([::1]:35392 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WTbC3-0004q3-FQ for ged-emacs-devel@m.gmane.org; Fri, 28 Mar 2014 14:07:51 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47303) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WTbBH-0003UH-Gy for emacs-devel@gnu.org; Fri, 28 Mar 2014 14:07:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WTbBC-0008SG-UY for emacs-devel@gnu.org; Fri, 28 Mar 2014 14:07:03 -0400 Original-Received: from static-71-162-243-5.phlapa.fios.verizon.net ([71.162.243.5]:49968 helo=snark.thyrsus.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WTbBC-0008SA-QG for emacs-devel@gnu.org; Fri, 28 Mar 2014 14:06:58 -0400 Original-Received: by snark.thyrsus.com (Postfix, from userid 1000) id DC5DB380492; Fri, 28 Mar 2014 14:06:57 -0400 (EDT) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 71.162.243.5 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:171086 Archived-At: In order to graft the Aquamacs branch to the git conversion of the Emacs repository, I need to extract from it an import-stream branch dump consisting of all the Aquamacs commits and *only* those commits. Furthermore, in order for merges to Aquamacs to be built correctly, the parent links in the branch dump cannot be ordinary marks, which would have no meaning outside the full Aquamacs repository the branch dump was made from. Instead, they must be callouts - action stamps that identify a parent commit by committer email and date and can refer between repositories. Identifying the correct set of commits is not trivial either. To accomplish this, I have written a new reposurgeon primitive function #dsc() which takes a selection set and adds to it all descendants of that set. In principle, then, it should be possible to extract the correct branch dump like this: reposurgeon % read aquamacs-emacs % @dsc(<2005-06-06T18:41:57Z!david.reitter@gmail.com>) write --callout >aquamacs-branch.fi where the @dsc() argument is intended to be the initial Aquamacs commit from which all subsequent ones are descended. If this worked, I should then be able to do this: % read Eric S. Raymond Every Communist must grasp the truth, 'Political power grows out of the barrel of a gun.' -- Mao Tse-tung, 1938, inadvertently endorsing the Second Amendment.