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: Private branch grafts Date: Sun, 9 Mar 2014 17:32:11 -0400 (EDT) Message-ID: <20140309213211.D4A62380860@snark.thyrsus.com> NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1394400770 6625 80.91.229.3 (9 Mar 2014 21:32:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 9 Mar 2014 21:32:50 +0000 (UTC) Cc: ":"@thyrsus.com, David Reitter To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Mar 09 22:32:58 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 1WMlL8-00015Y-0m for ged-emacs-devel@m.gmane.org; Sun, 09 Mar 2014 22:32:58 +0100 Original-Received: from localhost ([::1]:45585 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WMlL7-0008RC-BF for ged-emacs-devel@m.gmane.org; Sun, 09 Mar 2014 17:32:57 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45552) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WMlL0-0008R1-0f for emacs-devel@gnu.org; Sun, 09 Mar 2014 17:32:54 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WMlKt-0001Mr-KK for emacs-devel@gnu.org; Sun, 09 Mar 2014 17:32:49 -0400 Original-Received: from static-71-162-243-5.phlapa.fios.verizon.net ([71.162.243.5]:40530 helo=snark.thyrsus.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WMlKt-0001Mb-Dw for emacs-devel@gnu.org; Sun, 09 Mar 2014 17:32:43 -0400 Original-Received: by snark.thyrsus.com (Postfix, from userid 1000) id D4A62380860; Sun, 9 Mar 2014 17:32:11 -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:170239 Archived-At: I have built and tested some machinery to solve the Aquamacs problem. I am describing it on the Emacs list because other owners of private branches will need to know how it works. The new feature involved here is "callouts". They solve a problemm with partial repository writes, in which commits contain mark references for which the corresponding parent commits are not in the selection set written out. Previously, the write code would simply have dumped unaltered mark values, some of which would become meaningless outside the original repo context. What reposurgeon now does in that case is replace any unresolved marks with callouts (which are just action stamps identifying a date and committer). An import stream containing callouts cannot be loaded by git-fast-import. What can happen, though is this: when a stream with callouts is grafted to another repo, the code tries to resolve all the callout links in the context of that repo. It looks for a committer and committer-date match for each callout and, in effect, replaces it with the corresponding parent mark. The match attempt (and the graft) will fail if there is no matching committer/committer-date pair in the repo, or more than one. In that case (which I expect to be rare and might not occur at all) the offending callouts will need to be removed or hand-patched with ordinals, What I will is locate each branch you want to preserve, write it out as a partial dump with callouts, and graft iyit onto the main repository in this way. -- Eric S. Raymond The conclusion is thus inescapable that the history, concept, and wording of the second amendment to the Constitution of the United States, as well as its interpretation by every major commentator and court in the first half-century after its ratification, indicates that what is protected is an individual right of a private citizen to own and carry firearms in a peaceful manner. -- Report of the Subcommittee On The Constitution of the Committee On The Judiciary, United States Senate, 97th Congress, second session (February, 1982), SuDoc# Y4.J 89/2: Ar 5/5