From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: master 89898fc: Repair pdbtrack so it follows transition from one remote file to another. Date: Sun, 20 Sep 2015 20:06:57 +0300 Message-ID: <836135ow9a.fsf@gnu.org> References: Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1442768839 32034 80.91.229.3 (20 Sep 2015 17:07:19 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 20 Sep 2015 17:07:19 +0000 (UTC) Cc: rgm@gnu.org, emacs-devel@gnu.org To: Ken Manheimer Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Sep 20 19:07:07 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 1Zdi4w-0006yJ-QS for ged-emacs-devel@m.gmane.org; Sun, 20 Sep 2015 19:07:06 +0200 Original-Received: from localhost ([::1]:52859 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zdi4v-00012M-Lr for ged-emacs-devel@m.gmane.org; Sun, 20 Sep 2015 13:07:05 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59834) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zdi4k-00012F-8D for emacs-devel@gnu.org; Sun, 20 Sep 2015 13:06:55 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zdi4g-0002th-TC for emacs-devel@gnu.org; Sun, 20 Sep 2015 13:06:54 -0400 Original-Received: from mtaout25.012.net.il ([80.179.55.181]:49405) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zdi4g-0002tc-Ku; Sun, 20 Sep 2015 13:06:50 -0400 Original-Received: from conversion-daemon.mtaout25.012.net.il by mtaout25.012.net.il (HyperSendmail v2007.08) id <0NUZ00A00J50RM00@mtaout25.012.net.il>; Sun, 20 Sep 2015 20:03:49 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([84.94.185.246]) by mtaout25.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NUZ00295JED1K90@mtaout25.012.net.il>; Sun, 20 Sep 2015 20:03:49 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.181 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:190143 Archived-At: > From: Ken Manheimer > Date: Sun, 20 Sep 2015 11:59:46 -0400 > > I am clear that I should remove the ChangeLog.17 entry, and can easily do that > with an additional, cumulative commit. > > I gather my commit message for the code change should have been: > > > > Repair pdbtrack remote file tracking > > > * lisp/progmodes/python.el (python-pdbtrack-set-tracked-buffer): Rectify > pdbtrack so it follows transition from one remote file to another. > > > I think I am able to `git amend` the original code commit, but I have very > rarely done that, and am not sure it's the right thing, besides. So: should I > amend 89898fc, or just do another, distinct commit? You cannot amend a commit you've already pushed. Also, the commit message cannot be fixed by another commit. What you can do is fix the entry in ChangeLog.2 produced from that commit log, and then commit the modified ChangeLog.2. > Also, I have finally found the location of guidance for commit messages - > CONTRIBUTORS in the source directory root. I had looked for guidance in > http://www.emacswiki.org/emacs/GitForEmacsDevs - it would have be helpful if > that prominently directed contributors to the CONTRIBUTORS file. Perhaps I'm > just oblivious, but it seems like the various guidance resources are scattered > enough that there is not an unmissable "garden path" to fill people in. CONTRIBUTORS is the only reference you should read.