Re: master 89898fc: Repair pdbtrack so it follows transition from one remote file to another.

Re: master 89898fc: Repair pdbtrack so it follows transition from one remote file to another.

[Ken Manheimer]

[-- Attachment #1: Type: text/plain, Size: 2144 bytes --]

[Whoops - inadvertently sent my reply only to Glenn, so re-sending to all.
I have a push ready for origin/master with the amended commit and the
ChangeLog.17 entry removed, just waiting for affirmation that amending is
the right thing to do. Details and another question are in-line below.]

On Sun, Sep 20, 2015 at 6:44 AM, Glenn Morris <rgm@gnu.org> wrote:

> ken manheimer wrote:
>
> >     * python.el (python-pdbtrack-set-tracked-buffer).
>
> Should have been:
>
> * lisp/python.el (python-pdbtrack-set-tracked-buffer): Do something.
>
> > --- a/lisp/ChangeLog.17
> > +++ b/lisp/ChangeLog.17
> > @@ -1,3 +1,8 @@
> > +2015-09-20  Ken Manheimer  <ken.manheimer@gmail.com>
> > +
> > +     * python.el (python-pdbtrack-set-tracked-buffer): Repair pdbtrack
> > +     so it follows transition from one remote file to another.
> > +
> >  2015-04-06  Alan Mackenzie  <acm@muc.de>
>
> Please remove this addition.
> ChangeLogs are auto-generated for some time.
> Did you think no-one had made a change for the past 5 months, or that we
> renamed the Changelog to "ChangeLog.17"? ;)
>

Ok. I have a few questions for you.

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?

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.

Ken

[-- Attachment #2: Type: text/html, Size: 3771 bytes --]

Re: master 89898fc: Repair pdbtrack so it follows transition from one remote file to another.

[Eli Zaretskii]

> From: Ken Manheimer <ken.manheimer@gmail.com>
> 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.

Re: master 89898fc: Repair pdbtrack so it follows transition from one remote file to another.

[Xue Fuqiao]

On Sun, Sep 20, 2015 at 11:59 PM, Ken Manheimer <ken.manheimer@gmail.com> wrote:

> 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.

Perhaps you can edit that page and mention CONTRIBUTE (not CONTRIBUTORS,
sorry for the nitpick) in the page.  Here are the URIs of CONTRIBUTE in
the current stable release and master:

* https://www.gnu.org/software/emacs/CONTRIBUTE
* http://git.savannah.gnu.org/cgit/emacs.git/plain/CONTRIBUTE

Re: master 89898fc: Repair pdbtrack so it follows transition from one remote file to another.

[Ken Manheimer]

[-- Attachment #1: Type: text/plain, Size: 1346 bytes --]

On Sun, Sep 20, 2015 at 7:01 PM, Xue Fuqiao <xfq.free@gmail.com> wrote:

> On Sun, Sep 20, 2015 at 11:59 PM, Ken Manheimer <ken.manheimer@gmail.com>
> wrote:
>
> > 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.
>
> Perhaps you can edit that page and mention CONTRIBUTE (not CONTRIBUTORS,
> sorry for the nitpick) in the page.  Here are the URIs of CONTRIBUTE in
> the current stable release and master:
>
> * https://www.gnu.org/software/emacs/CONTRIBUTE
> * http://git.savannah.gnu.org/cgit/emacs.git/plain/CONTRIBUTE


Thanks - that's exactly the kind of solution I was seeking!

I've rectified the entry in ChangeLog.2. I also included a few references
to the CONTRIBUTE file in the GitForEmacsDev
<http://www.emacswiki.org/emacs/GitForEmacsDevs> page, as you suggested. I
don't know that it will be clear to every developer who visits that page,
but I think the clue is more available than it was before.

Ken

[-- Attachment #2: Type: text/html, Size: 2175 bytes --]

Re: master 89898fc: Repair pdbtrack so it follows transition from one remote file to another.

[Glenn Morris]

ken manheimer wrote:

>     * python.el (python-pdbtrack-set-tracked-buffer).

Should have been:

* lisp/python.el (python-pdbtrack-set-tracked-buffer): Do something.

> --- a/lisp/ChangeLog.17
> +++ b/lisp/ChangeLog.17
> @@ -1,3 +1,8 @@
> +2015-09-20  Ken Manheimer  <ken.manheimer@gmail.com>
> +
> +	* python.el (python-pdbtrack-set-tracked-buffer): Repair pdbtrack
> +	so it follows transition from one remote file to another.
> +
>  2015-04-06  Alan Mackenzie  <acm@muc.de>

Please remove this addition.
ChangeLogs are auto-generated for some time.
Did you think no-one had made a change for the past 5 months, or that we
renamed the Changelog to "ChangeLog.17"? ;)

Re: master 89898fc: Repair pdbtrack so it follows transition from one remote file to another.

[Glenn Morris]

Glenn Morris wrote:

> Should have been:
>
> * lisp/python.el (python-pdbtrack-set-tracked-buffer): Do something.

Whoops, missing "progmodes/" there.

Re: master 89898fc: Repair pdbtrack so it follows transition from one remote file to another.

[Eli Zaretskii]

> From: Glenn Morris <rgm@gnu.org>
> Date: Sun, 20 Sep 2015 07:35:12 -0400
> Cc: Ken Manheimer <ken.manheimer@gmail.com>
> 
> Glenn Morris wrote:
> 
> > Should have been:
> >
> > * lisp/python.el (python-pdbtrack-set-tracked-buffer): Do something.
> 
> Whoops, missing "progmodes/" there.

I've just fixed quite a few formatting and other similar errors in
ChangeLog.2.  Among the worst offenders:

  . Missing or incorrect file names
  . Sentences not starting with a capital letter
  . UK English spelling
  . Log entries that don't mention the affected files/functions at all
  . Incomplete sentences
  . Too long lines

Please, crowd, try to pay more attention.