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: Private branch grafts Date: Thu, 13 Mar 2014 21:54:44 -0400 Message-ID: References: <20140309213211.D4A62380860@snark.thyrsus.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 (Mac OS X Mail 7.2 \(1874\)) Content-Type: multipart/signed; boundary="Apple-Mail=_309C7F76-8114-46A4-BBE9-B1151C381199"; protocol="application/pkcs7-signature"; micalg=sha1 X-Trace: ger.gmane.org 1394762103 6403 80.91.229.3 (14 Mar 2014 01:55:03 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 14 Mar 2014 01:55:03 +0000 (UTC) Cc: ":"@thyrsus.com, emacs-devel@gnu.org To: "Eric S. Raymond" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Mar 14 02:55:13 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 1WOHL4-0006by-KA for ged-emacs-devel@m.gmane.org; Fri, 14 Mar 2014 02:55:10 +0100 Original-Received: from localhost ([::1]:42323 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOHL4-0004pH-6X for ged-emacs-devel@m.gmane.org; Thu, 13 Mar 2014 21:55:10 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60925) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOHKw-0004ee-P2 for emacs-devel@gnu.org; Thu, 13 Mar 2014 21:55:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WOHKr-000752-Vl for emacs-devel@gnu.org; Thu, 13 Mar 2014 21:55:02 -0400 Original-Received: from mail-qc0-x235.google.com ([2607:f8b0:400d:c01::235]:33585) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOHKr-00073C-Pe for emacs-devel@gnu.org; Thu, 13 Mar 2014 21:54:57 -0400 Original-Received: by mail-qc0-f181.google.com with SMTP id e9so2161956qcy.40 for ; Thu, 13 Mar 2014 18:54:55 -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 :message-id:references:to; bh=gv13brTrBVKA2IFAULGS9+F5B5V2PD5kZXjF/OhbbPs=; b=i21nU229fdf2dVshGLoSlfayUhOPeP/KoGM0zSXMu6+8ANq5eiC5HIYh46ZKWXYV9o 9JcAlwDrHPgUrZc7Zz/OgGkhzfZvoDvH5W51QQegSqn8hlR/zGFCkhCiJQ3shSahhrg6 PxIcmkVidibMEDIHEqHAG+6s9AadJfLiBEW7Sp2tzA8urlAnzeebS/LAU1v+JVhOmj4k E9w+Bp0iHzDrOOBs4fOjLxY+lJvUYrmQ96djx7thC5xBNemuPexDi1FI14zrM1r7jKhv ccj8R1eQJYSL13WOehPipSqTdx4w2gH8eEyP6apbbQlbEE288l6u1ZUWgJq1QIGyZkjv TUTw== X-Received: by 10.229.219.133 with SMTP id hu5mr6596757qcb.5.1394762094961; Thu, 13 Mar 2014 18:54:54 -0700 (PDT) Original-Received: from [10.0.2.128] (c-71-58-245-42.hsd1.pa.comcast.net. [71.58.245.42]) by mx.google.com with ESMTPSA id r110sm6045233qgd.1.2014.03.13.18.54.46 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 13 Mar 2014 18:54:46 -0700 (PDT) In-Reply-To: <20140309213211.D4A62380860@snark.thyrsus.com> X-Mailer: Apple Mail (2.1874) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c01::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:170332 Archived-At: --Apple-Mail=_309C7F76-8114-46A4-BBE9-B1151C381199 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii Eric, Thanks for your work. Is there a version of the converted repository = that we can inspect? Thanks, David On Mar 9, 2014, at 5:32 PM, Eric S. Raymond wrote: > 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. >=20 > 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. >=20 > 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). >=20 > 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. >=20 > The match attempt (and the graft) will fail if there is no matching=20 > 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=20 > offending callouts will need to be removed or hand-patched with = ordinals, >=20 > 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.=20 >=20 > --=20 > Eric S. = Raymond >=20 > The conclusion is thus inescapable that the history, concept, and=20 > wording of the second amendment to the Constitution of the United=20 > States, as well as its interpretation by every major commentator and=20= > court in the first half-century after its ratification, indicates=20 > that what is protected is an individual right of a private citizen=20 > to own and carry firearms in a peaceful manner. > -- Report of the Subcommittee On The Constitution of the = Committee On=20 > The Judiciary, United States Senate, 97th Congress, second = session=20 > (February, 1982), SuDoc# Y4.J 89/2: Ar 5/5 --Apple-Mail=_309C7F76-8114-46A4-BBE9-B1151C381199 Content-Disposition: attachment; filename=smime.p7s Content-Type: application/pkcs7-signature; name=smime.p7s Content-Transfer-Encoding: base64 MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIMijCCBjQw ggQcoAMCAQICAR4wDQYJKoZIhvcNAQEFBQAwfTELMAkGA1UEBhMCSUwxFjAUBgNVBAoTDVN0YXJ0 Q29tIEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRlIFNpZ25pbmcxKTAn BgNVBAMTIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA3MTAyNDIxMDE1NVoX DTE3MTAyNDIxMDE1NVowgYwxCzAJBgNVBAYTAklMMRYwFAYDVQQKEw1TdGFydENvbSBMdGQuMSsw KQYDVQQLEyJTZWN1cmUgRGlnaXRhbCBDZXJ0aWZpY2F0ZSBTaWduaW5nMTgwNgYDVQQDEy9TdGFy dENvbSBDbGFzcyAxIFByaW1hcnkgSW50ZXJtZWRpYXRlIENsaWVudCBDQTCCASIwDQYJKoZIhvcN AQEBBQADggEPADCCAQoCggEBAMcJg8zOLdgasSmkLhOrlr6KMoOMpohBllVHrdRvEg/q6r8jR+EK 75xCGhR8ToREoqe7zM9/UnC6TS2y9UKTpT1v7RSMzR0t6ndl0TWBuUr/UXBhPk+Kmy7bI4yW4urC +y7P3/1/X7U8ocb8VpH/Clt+4iq7nirMcNh6qJR+xjOhV+VHzQMALuGYn5KZmc1NbJQYclsGkDxD z2UbFqE2+6vIZoL+jb9x4Pa5gNf1TwSDkOkikZB1xtB4ZqtXThaABSONdfmv/Z1pua3FYxnCFmdr /+N2JLKutIxMYqQOJebr/f/h5t95m4JgrM3Y/w7YX9d7YAL9jvN4SydHsU6n65cCAwEAAaOCAa0w ggGpMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRTcu2SnODaywFc fH6WNU7y1LhRgjAfBgNVHSMEGDAWgBROC+8apEBbpRdphzDKNGhD0EGu8jBmBggrBgEFBQcBAQRa MFgwJwYIKwYBBQUHMAGGG2h0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9jYTAtBggrBgEFBQcwAoYh aHR0cDovL3d3dy5zdGFydHNzbC5jb20vc2ZzY2EuY3J0MFsGA1UdHwRUMFIwJ6AloCOGIWh0dHA6 Ly93d3cuc3RhcnRzc2wuY29tL3Nmc2NhLmNybDAnoCWgI4YhaHR0cDovL2NybC5zdGFydHNzbC5j b20vc2ZzY2EuY3JsMIGABgNVHSAEeTB3MHUGCysGAQQBgbU3AQIBMGYwLgYIKwYBBQUHAgEWImh0 dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cu c3RhcnRzc2wuY29tL2ludGVybWVkaWF0ZS5wZGYwDQYJKoZIhvcNAQEFBQADggIBAAqDCH14qywG XLhjjF6uHLkjd02hcdh9hrw+VUsv+q1eeQWB21jWj3kJ96AUlPCoEGZ/ynJNScWy6QMVQjbbMXlt UfO4n4bGGdKo3awPWp61tjAFgraLJgDk+DsSvUD6EowjMTNx25GQgyYJ5RPIzKKR9tQW8gGK+2+R HxkUCTbYFnL6kl8Ch507rUdPPipJ9CgJFws3kDS3gOS5WFMxcjO5DwKfKSETEPrHh7p5shuuNktv sv6hxHTLhiMKX893gxdT3XLS9OKmCv87vkINQcNEcIIoFWbP9HORz9v3vQwR4e3ksLc2JZOAFK+s sS5XMEoznzpihEP0PLc4dCBYjbvSD7kxgDwZ+Aj8Q9PkbvE9sIPP7ON0fz095HdThKjiVJe6vofq +n6b1NBc8XdrQvBmunwxD5nvtTW4vtN6VY7mUCmxsCieuoBJ9OlqmsVWQvifIYf40dJPZkk9YgGT zWLpXDSfLSplbY2LL9C9U0ptvjcDjefLTvqSFc7tw1sEhF0n/qpA2r0GpvkLRDmcSwVyPvmjFBGq Up/pNy8ZuPGQmHwFi2/14+xeSUDG2bwnsYJQG2EdJCB6luQ57GEnTA/yKZSTKI8dDQa8Sd3zfXb1 9mOgSF0bBdXbuKhEpuP9wirslFe6fQ1t5j5R0xi72MZ8ikMu1RQZKCyDbMwazlHiMIIGTjCCBTag AwIBAgIDB4xcMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRD b20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYG A1UEAxMvU3RhcnRDb20gQ2xhc3MgMSBQcmltYXJ5IEludGVybWVkaWF0ZSBDbGllbnQgQ0EwHhcN MTMwOTExMTU0NjQzWhcNMTQwOTEzMDYzNTI5WjBlMRkwFwYDVQQNExBLVDJPSGk2eGtnT1paVEk3 MSAwHgYDVQQDDBdkYXZpZC5yZWl0dGVyQGdtYWlsLmNvbTEmMCQGCSqGSIb3DQEJARYXZGF2aWQu cmVpdHRlckBnbWFpbC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAD7+VgKRt szgfbINNeOXWI/xwsBQFvoyCviYA5OX6xnqsHQ5Cv9eOdzVGbjCh7LQhpcuuWzEzKVW0Yoh5fjHF l9RXM3nAd2FlYhJUaZTgnUwZF5f4Gi7y/QAJTz507o4uYVNx7NiHy+XW8Sqbik557EO5QZZ2S6Qj ScKSqhsnvsEzeRIpwUlFesOLHh87Yryyc65+09qecswow+3/VmgwC5U0BedYZwme0Q9zDYoyexNa UFOvkVu5hvn99EUQtR2StXx1U5q6yXG78AIGJQ09vNBSvTfawRlVtNq28SU4eS3BurITwpU8P4E1 Rr8ccXcNTNonUzp5DHAI+yX+IYVFAgMBAAGjggLdMIIC2TAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE sDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwQwHQYDVR0OBBYEFID908J06bvRHxYQyUSX VFtNkqf1MB8GA1UdIwQYMBaAFFNy7ZKc4NrLAVx8fpY1TvLUuFGCMCIGA1UdEQQbMBmBF2Rhdmlk LnJlaXR0ZXJAZ21haWwuY29tMIIBTAYDVR0gBIIBQzCCAT8wggE7BgsrBgEEAYG1NwECAzCCASow LgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwgfcGCCsGAQUF BwICMIHqMCcWIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MAMCAQEagb5UaGlzIGNl cnRpZmljYXRlIHdhcyBpc3N1ZWQgYWNjb3JkaW5nIHRvIHRoZSBDbGFzcyAxIFZhbGlkYXRpb24g cmVxdWlyZW1lbnRzIG9mIHRoZSBTdGFydENvbSBDQSBwb2xpY3ksIHJlbGlhbmNlIG9ubHkgZm9y IHRoZSBpbnRlbmRlZCBwdXJwb3NlIGluIGNvbXBsaWFuY2Ugb2YgdGhlIHJlbHlpbmcgcGFydHkg b2JsaWdhdGlvbnMuMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly9jcmwuc3RhcnRzc2wuY29tL2Ny dHUxLWNybC5jcmwwgY4GCCsGAQUFBwEBBIGBMH8wOQYIKwYBBQUHMAGGLWh0dHA6Ly9vY3NwLnN0 YXJ0c3NsLmNvbS9zdWIvY2xhc3MxL2NsaWVudC9jYTBCBggrBgEFBQcwAoY2aHR0cDovL2FpYS5z dGFydHNzbC5jb20vY2VydHMvc3ViLmNsYXNzMS5jbGllbnQuY2EuY3J0MCMGA1UdEgQcMBqGGGh0 dHA6Ly93d3cuc3RhcnRzc2wuY29tLzANBgkqhkiG9w0BAQUFAAOCAQEAY65hYG7QHAFpetZOFvyk cf+gHuH0da38MNwPwMGFsUQSyiizAyb2fVfJSyMcmVuHdEmhSGTx2f4bSH1qg9hajF7w66HAR+rJ UYP42GUXIk1402EPj+6NNkCspKArK8Gj2NjOabvcqS8it00iwAYyx4Y8gbsOXNy4RFg402SeDh3K e5Dvk4AxszbEcaSzO9awHJQDETEs7HoUDDxzjaL2T+o4KjIlTtSoAnSVjIphNyKMIUYj1K9GyiAJ z4/FVzM5MqNKd6LY9x57vf8/ctL5mKbbOeXBnjbgWxUJbjnbp5+knm7TymMemVbUYxi/qN3MmBlp aFMOLfXJU0CJJTclXDGCA28wggNrAgEBMIGUMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3Rh cnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4 MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3MgMSBQcmltYXJ5IEludGVybWVkaWF0ZSBDbGllbnQgQ0EC AweMXDAJBgUrDgMCGgUAoIIBrzAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJ BTEPFw0xNDAzMTQwMTU0NDRaMCMGCSqGSIb3DQEJBDEWBBRTCHJpZ4eKCzZzX7hLp+0xPr4snDCB pQYJKwYBBAGCNxAEMYGXMIGUMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRk LjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMv U3RhcnRDb20gQ2xhc3MgMSBQcmltYXJ5IEludGVybWVkaWF0ZSBDbGllbnQgQ0ECAweMXDCBpwYL KoZIhvcNAQkQAgsxgZeggZQwgYwxCzAJBgNVBAYTAklMMRYwFAYDVQQKEw1TdGFydENvbSBMdGQu MSswKQYDVQQLEyJTZWN1cmUgRGlnaXRhbCBDZXJ0aWZpY2F0ZSBTaWduaW5nMTgwNgYDVQQDEy9T dGFydENvbSBDbGFzcyAxIFByaW1hcnkgSW50ZXJtZWRpYXRlIENsaWVudCBDQQIDB4xcMA0GCSqG SIb3DQEBAQUABIIBALeEzquTiJ8ree7q+/HCM33SRNu40EN8vvx31HTvt6g8ZGr0zPPkkr2XQDjU LBHPaLtvHwZUsyT/sUvtbAEjvvyi3dPURhZfNvGyVkT7SaDVC2WIR5pdOWoSzb7QkVWVg4ImW8Up kOIrXlt48uxjKrKuuWRG8Vf35TR7yLAX8a0x8cNncCweIR8mD0ATefBA3hhjrcWTaj2M0R7vtOmM bvN4D7gRR/gQei7/BGtfGmF5XGAoe8GAWaV268pDqrWPCYtHcEt0/rHM2i7vD6hOuHgb9HbgUjUp bU5TznIEaAjl7dQvED8Rr+gkvu2b6NsyWRX32dVaaiMLYuxxQXCm49MAAAAAAAA= --Apple-Mail=_309C7F76-8114-46A4-BBE9-B1151C381199--