From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Caldwell Newsgroups: gmane.emacs.devel Subject: Re: Is it time to drop ChangeLogs? Date: Sun, 13 Mar 2016 10:52:00 -0700 Message-ID: References: <64a52598-ad53-498c-993c-67d7827dbdfc@default> <838u1uuuau.fsf@gnu.org> <878u1um2xl.fsf@thinkpad.rath.org> <87fuw090k7.fsf@wanadoo.es> <83y49spuxt.fsf@gnu.org> <87pov4achc.fsf@acer.localhost.com> <83r3fkpb3u.fsf@gnu.org> <83lh5rps0t.fsf@gnu.org> <56E066BD.5050403@cs.ucla.edu> <83wpp9jt82.fsf@gnu.org> <87pov1dje9.fsf@thinkpad.rath.org> <83pouyfk6k.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-256; boundary="------------ms020607010002060002080302" X-Trace: ger.gmane.org 1457891579 5553 80.91.229.3 (13 Mar 2016 17:52:59 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 13 Mar 2016 17:52:59 +0000 (UTC) Cc: rms@gnu.org, emacs-devel@gnu.org To: Eli Zaretskii , Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Mar 13 18:52:49 2016 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 1afAC8-0008RQ-45 for ged-emacs-devel@m.gmane.org; Sun, 13 Mar 2016 18:52:48 +0100 Original-Received: from localhost ([::1]:37005 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afAC4-0003kX-Dl for ged-emacs-devel@m.gmane.org; Sun, 13 Mar 2016 13:52:44 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44286) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afABv-0003kB-So for emacs-devel@gnu.org; Sun, 13 Mar 2016 13:52:40 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1afABr-0003rB-1f for emacs-devel@gnu.org; Sun, 13 Mar 2016 13:52:35 -0400 Original-Received: from sa38.galvanix.net ([98.126.48.38]:36828 helo=kill.porkrind.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afABl-0003n9-QC; Sun, 13 Mar 2016 13:52:26 -0400 Original-Received: from porkrind.org (cpe-23-241-25-146.socal.res.rr.com [23.241.25.146]) by kill.porkrind.org (Postfix) with ESMTPS id 00C955F20D; Sun, 13 Mar 2016 10:52:02 -0700 (PDT) Authentication-Results: kill.porkrind.org; dkim=pass (1536-bit key; unprotected) header.d=porkrind.org header.i=@porkrind.org header.b=v3w0Wd/b; dkim-atps=neutral Original-Received: from [10.0.0.105] (black.local [10.0.0.105]) (authenticated bits=0) by porkrind.org (8.15.2/8.15.2/Debian-4) with ESMTPSA id u2DHq1Kl008265 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Sun, 13 Mar 2016 10:52:02 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=porkrind.org; s=apoptygma; t=1457891522; bh=Hscp38RIilQ2sPMf5DK/Am3v1w6+D0LZEIm+wzvVgyk=; h=Subject:To:References:Cc:From:Date:In-Reply-To:From; b=v3w0Wd/blknoYuR0xJK7v4eLZuzo4yNAwkxLw2y+dSE+BylJ+9x35IcqgYC5E7cnr 2VNf4WuN9gzDdBypDmBC2vTgLzDVKjcYTrShom40HhcGxWYAPzh/K6LFIgr9U7VNDS c5JLl+9fhKyAk/zzn1jFkFKnhnm6QRvTO+XY0sNIFYNx0+JwxiV/JA+z8u0GSAF/Ex Q2sDpYtxvBC27M38f+3RU7Ra06BGj0y42uQmyrciksQMOuhTvPGp+QXxe85 Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAQAAAD9CzEMAAAACXBIWXMAAAsTAAALEwEAmpwY AAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+S X8VGAAABiklEQVR42rRYSZIDIQwzLv7/ZXLoEAzeBKG7ag4DRhZeBKQ0Qr5imLWCrKwn0HImc1Mx aAvmmc/cuAT7RMYws6v/gHeb0p4/y5792GJJlLZWOPgsdV5NaRes4Xe4632sLljD7wKv1Ta74H/h MxecN1Rc2TatYcP7zb+6WFfN/zMSHg1Ymuxjrzd+DuLw6Nlekggt1hvr7KK9tRIX85jjM6GTYhfv nzXH3jBdYc4koueBs66M+Xv9O9n5ML4urWssjGeMY3if3bzGSvk30BQ46OOaxJjLCpzPJAzXrOrD z5VFh58TIiwESIiCHNxxwPTy97qDei8YdpVdyYEv6EQcK8n+iTyE/Cn1eoe7HwN+F56oErVSGtJY Q1sR2ehaUHfjvJuv0tL7qAzEbBmfF2IHrVi8zp9N0pZtQZZHOXp/sLW4+hqKvm3iccaPwP3XgnKX n8/YtVeOsnenRG7VCBFlZ5fe3LOyANCVdGAIwDs7tTXGF4hIk15/iAfSgv2UkNFItSszOG3Ha7r0 GQBerhBkHOAzmQAAAABJRU5ErkJggg== User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:45.0) Gecko/20100101 Thunderbird/45.0 In-Reply-To: <83pouyfk6k.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 98.126.48.38 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:201619 Archived-At: This is a cryptographically signed message in MIME format. --------------ms020607010002060002080302 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 3/13/16 8:53 AM, Eli Zaretskii wrote: >> From: Stefan Monnier >> Date: Sat, 12 Mar 2016 17:33:16 -0500 >> Cc: emacs-devel@gnu.org >> >> Personally, I think that handling cherry-picking and rebasing is >> very secondary. >=20 > We use the former for backporting changes from master. Cherry-picking a replaced commit works, as long as you use the replacement SHA. This is the hash that shows up when you `git log`, so it should just work without any thought on the part of the cherry-picker.= > As for the latter, I think quite a few people who track the > development and contribute patches do that, so I think it's important > for their workflows to be undisturbed. I don't see why people who are tracking Emacs are rebasing commits which have been pushed to the master or branch. Nonetheless, if you rebase and one of the commits you are rebasing has been replaced, the replacement gets used instead of the original. In both of these cases, the new commit doesn't generate new replacement commits. This means, for the use case we are thinking of here, that the old (presumably incorrect) log message will be lost when you rebase or cherry-pick. -David Here's my test log if you want to recreate my results, or poke around a =2Egit repo with replacements: mkdir -p /tmp/test/a cd /tmp/test/a git init echo a > a git add a git commit -m "a" echo b > a git add a git commit -m "changes" git replace --edit HEAD # changed the message in emacs to "b" git log # verified message was changed git checkout HEAD^ git checkout -b c echo c > c git add c git commit -m "c" git log master git cherry-pick e3291a2f81bad7b24ba18e28e60378667ff78acd # The hash that the previous `git log master` showed git log # verified cherry-picked commit has correct message find .git/refs/ # no new replacement refs created git checkout master git rebase c git log find .git/refs/ # no new replacement refs created --------------ms020607010002060002080302 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature MIAGCSqGSIb3DQEHAqCAMIACAQExDzANBglghkgBZQMEAgEFADCABgkqhkiG9w0BBwEAAKCC Ct0wggTzMIID26ADAgECAhA5IEwCoOHUpDUe6xUti95tMA0GCSqGSIb3DQEBCwUAMHUxCzAJ BgNVBAYTAklMMRYwFAYDVQQKEw1TdGFydENvbSBMdGQuMSkwJwYDVQQLEyBTdGFydENvbSBD ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEjMCEGA1UEAxMaU3RhcnRDb20gQ2xhc3MgMSBDbGll bnQgQ0EwHhcNMTYwMjA5MDA1NTI1WhcNMTcwMjA5MDA1NTI1WjBAMRswGQYDVQQDDBJkYXZp ZEBwb3JrcmluZC5vcmcxITAfBgkqhkiG9w0BCQEWEmRhdmlkQHBvcmtyaW5kLm9yZzCCASIw DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOqlU6S8xlPcP2hxvHVNDpEO3Vuq+vS1x2dP 1AOhXxKU8qkcX7bpBMx94GtXi4Hskhpl11vOBdJagkXf5/ngCV70lkeCudGdxDaNCreWkNze bdVPLu4/sIjWdG9puNly9QAlGR1zS+NSCXrdvSlxew14mYidSd6/lTFKVzqV3nJDkzyWEtC0 rY1jyZKW3dwowiAjbIDdHAqhqO6XYrs9ISnRRICYNVsWgzr34VMZrduInYvZUkwzBXbB1foa c7KNO96v6Dmh/DddFrJ916An6obyddsnG8y1G0uGmhBmj8vfV6NJV9zA4pmkYZ4gaas+S2XG qosjq4k1LMkJrxosa00CAwEAAaOCAbIwggGuMAsGA1UdDwQEAwIEsDAdBgNVHSUEFjAUBggr BgEFBQcDAgYIKwYBBQUHAwQwCQYDVR0TBAIwADAdBgNVHQ4EFgQUA9l0VXhtsu5JI+KrWaUs HejEFW0wHwYDVR0jBBgwFoAUJIFsOWG+SQ+PtxtGK8kotSdIbWgwbwYIKwYBBQUHAQEEYzBh MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5zdGFydHNzbC5jb20wOQYIKwYBBQUHMAKGLWh0 dHA6Ly9haWEuc3RhcnRzc2wuY29tL2NlcnRzL3NjYS5jbGllbnQxLmNydDA4BgNVHR8EMTAv MC2gK6AphidodHRwOi8vY3JsLnN0YXJ0c3NsLmNvbS9zY2EtY2xpZW50MS5jcmwwHQYDVR0R BBYwFIESZGF2aWRAcG9ya3JpbmQub3JnMCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cuc3RhcnRz c2wuY29tLzBGBgNVHSAEPzA9MDsGCysGAQQBgbU3AQIEMCwwKgYIKwYBBQUHAgEWHmh0dHA6 Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeTANBgkqhkiG9w0BAQsFAAOCAQEAnnRLhi5jCnSZ qiS1BpSFXvPECUTyZcTJTFYPYZ8ftv4vVi4am7rEUht4KPAY0HWPgAPp2qJUtXjGk65YX1q5 xgnHhF32nmptoydwuO6Pp2KfuRhfN5ZpWAIsC6gaYI8vYr54q/fkmSYzyTMT4YSWQjLoCb/x 2h/kUvMyxQl36g2PKziLXg8iUx0DzFdqf0QPuvQ4sDmOIadR5MkYnZ23tJLD0ytPRUIA7XaF GfhJ6i+jmHPStqNjsd/xgJZoPCfhJxmUkReFKazL4BYH1UGhz/U17yfl8trSFMIoWuoVJ/hK 8BNxW53skV2LTtoMODaT55xtqhqMKAu/9qvkVkjrmzCCBeIwggPKoAMCAQICEGunin0K14jW UQr5WeTntOEwDQYJKoZIhvcNAQELBQAwfTELMAkGA1UEBhMCSUwxFjAUBgNVBAoTDVN0YXJ0 Q29tIEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRlIFNpZ25pbmcx KTAnBgNVBAMTIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTE1MTIxNjAx MDAwNVoXDTMwMTIxNjAxMDAwNVowdTELMAkGA1UEBhMCSUwxFjAUBgNVBAoTDVN0YXJ0Q29t IEx0ZC4xKTAnBgNVBAsTIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSMwIQYD VQQDExpTdGFydENvbSBDbGFzcyAxIENsaWVudCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEP ADCCAQoCggEBAL192vfDon2D9luC/dtbX64eG3XAtRmvmCSsu1d52DXsCR58zJQbCtB2/A5u FqNxWacpXGGtTCRk9dEDBlmixEd8QiLkUfvHpJX/xKnmVkS6Iye8wUbYzMsDzgnpazlPg19d nSqfhM+Cevdfa89VLnUztRr2cgmCfyO9Otrh7LJDPG+4D8ZnAqDtVB8MKYJL6QgKyVhhaBc4 y3bGWxKyXEtx7QIZZGxPwSkzK3WIN+VKNdkiwTubW5PIdopmykwvIjLPqbJK7yPwFZYekKE0 15OsW6FV+s4DIM8UlVS8pkIsoGGJtMuWjLL4tq2hYQuuN0jhrxK1ljz50hH23gA9cbMCAwEA AaOCAWQwggFgMA4GA1UdDwEB/wQEAwIBBjAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH AwQwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRwOi8vY3JsLnN0 YXJ0c3NsLmNvbS9zZnNjYS5jcmwwZgYIKwYBBQUHAQEEWjBYMCQGCCsGAQUFBzABhhhodHRw Oi8vb2NzcC5zdGFydHNzbC5jb20wMAYIKwYBBQUHMAKGJGh0dHA6Ly9haWEuc3RhcnRzc2wu Y29tL2NlcnRzL2NhLmNydDAdBgNVHQ4EFgQUJIFsOWG+SQ+PtxtGK8kotSdIbWgwHwYDVR0j BBgwFoAUTgvvGqRAW6UXaYcwyjRoQ9BBrvIwPwYDVR0gBDgwNjA0BgRVHSAAMCwwKgYIKwYB BQUHAgEWHmh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeTANBgkqhkiG9w0BAQsFAAOC AgEAi+P3h+wBi4StDwECW5zhIycjBL008HACblIf26HY0JdOruKbrWDsXUsiI0j/7Crft9S5 oxvPiDtVqspBOB/y5uzSns1lZwh7sG96bYBZpcGzGxpFNjDmQbcM3yl3WFIRS4WhNrsOY14V 7y2IrUGsvetsD+bjyOngCIVeC/GmsmtbuLOzJ606tEc9uRbhjTu/b0x2Fo+/e7UkQvKzNeo7 OMhijixaULyINBfCBJb+e29bLafgu6JqjOUJ9eXXj20p6q/CW+uVrZiSW57+q5an2P2i7hP8 5jQJcy5j4HzA0rSiF3YPhKGAWUxKPMAVGgcYoXzWydOvZ3UDsTDTagXpRDIKQLZo02wrlxY6 iMFqvlzsemVf1odhQJmi7Eh5TbxI40kDGcBOBHhwnaOumZhLP+SWJQnjpLpSlUOj95uf1zo9 oz9e0NgIJoz/tdfrBzez76xtDsK0KfUDHt1/q59BvDI7RX6gVr0fQoCyMczNzCTcRXYHY0tq 2J0oT+bsb6sH2b4WVWAiJKnSYaWDjdA70qHX4mq9MIjO/ZskmSY8wtAk24orAc0vwXgYanqN sBX5Yv4sN4Z9VyrwMdLcusP7HJgRdAGKpkR2I9U4zEsNJQJewM7S4Jalo1DyPrLpL2nTET8Z rSl5Utp1UeGp/2deoprGevfnxWB+vHNQiu85o6MxggPMMIIDyAIBATCBiTB1MQswCQYDVQQG EwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjEpMCcGA1UECxMgU3RhcnRDb20gQ2VydGlm aWNhdGlvbiBBdXRob3JpdHkxIzAhBgNVBAMTGlN0YXJ0Q29tIENsYXNzIDEgQ2xpZW50IENB AhA5IEwCoOHUpDUe6xUti95tMA0GCWCGSAFlAwQCAQUAoIICEzAYBgkqhkiG9w0BCQMxCwYJ KoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0xNjAzMTMxNzUyMDBaMC8GCSqGSIb3DQEJBDEi BCAkT0MWeBOWHwXQ4gNwaAYbAuFNjoLw6pPFpawNJeR3GjBsBgkqhkiG9w0BCQ8xXzBdMAsG CWCGSAFlAwQBKjALBglghkgBZQMEAQIwCgYIKoZIhvcNAwcwDgYIKoZIhvcNAwICAgCAMA0G CCqGSIb3DQMCAgFAMAcGBSsOAwIHMA0GCCqGSIb3DQMCAgEoMIGaBgkrBgEEAYI3EAQxgYww gYkwdTELMAkGA1UEBhMCSUwxFjAUBgNVBAoTDVN0YXJ0Q29tIEx0ZC4xKTAnBgNVBAsTIFN0 YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSMwIQYDVQQDExpTdGFydENvbSBDbGFz cyAxIENsaWVudCBDQQIQOSBMAqDh1KQ1HusVLYvebTCBnAYLKoZIhvcNAQkQAgsxgYyggYkw dTELMAkGA1UEBhMCSUwxFjAUBgNVBAoTDVN0YXJ0Q29tIEx0ZC4xKTAnBgNVBAsTIFN0YXJ0 Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSMwIQYDVQQDExpTdGFydENvbSBDbGFzcyAx IENsaWVudCBDQQIQOSBMAqDh1KQ1HusVLYvebTANBgkqhkiG9w0BAQEFAASCAQASNPocFoUd Zoe548VcTmsUPlMy02LJwVYIPwvopRGpPs0wDxkNouwDJ9EbVEBwiI1BKODQXnx5j8LrY+Mx 4N8y12CEaiXRQYfwwDlHs57fHgaJ871fv/Npo8OmYVY3rngzXiVi0lRR/yyY/iyOi1FMSRJ4 Igyv737fVnqM27akGHa0k2xEFHRVx+4A+vaYMumyl6edXYvFNoIQHIX4/O6IbSm/PYD0w6f+ GvyNzNmFtpN6dEO6Qi8ERZJYX67fGKZm5p+iQ9evq++Dr81pZUCy78cBFPZ3OLlbJ/OXHtHK 0KfjnR+mnm/TAWayi2sRBYdDfSEZoYR0VQMiFE7y7NOvAAAAAAAA --------------ms020607010002060002080302--