Re: master 01db800: Merge from origin/emacs-26

Re: master 01db800: Merge from origin/emacs-26

[Glenn Morris]

Michael Albinus wrote:

> branch: master
> commit 01db80046f41c94569efd5dcdb11a1e46b3f16f3
> Merge: 3ef212c 7eea314
> Author: Michael Albinus <michael.albinus@gmx.de>
> Commit: Michael Albinus <michael.albinus@gmx.de>
>
>     Merge from origin/emacs-26
>     
>     7eea3144d4 Minor Tramp fixes
>     c0a670a8b5 * lisp/help-mode.el (help-function-def): Allow help-make-x...
>     05720162c1 Fix doc-string of 'display-buffer-in-side-window'
>     a1bbc49015 Fix Bug#29579
>     cb3d979b74 ; NEWS: Update Org version number

Thanks for merging.
The NEWS change from cb3d979b74 seems to have gotten lost.
Any idea why?
It should have been applied to etc/NEWS.26 in master.

I tried to make gitmerge.el handled this automatically in master
0b6f4f2c60, so if you used that version of gitmerge, it may be my fault.

Re: master 01db800: Merge from origin/emacs-26

[Michael Albinus]

Glenn Morris <rgm@gnu.org> writes:

Hi Glenn,

> The NEWS change from cb3d979b74 seems to have gotten lost.
> Any idea why?
> It should have been applied to etc/NEWS.26 in master.
>
> I tried to make gitmerge.el handled this automatically in master
> 0b6f4f2c60, so if you used that version of gitmerge, it may be my fault.

I took your word that merging with gitmerge.el is pretty easy. It
started well. During the merge, I was asked whether I want to apply the
changes of NEWS to NEWS.26 in master. I confirmed.

After that, the master branch was somehow broken. Further attempts to
run gitmerge told me "fatal: You have not concluded your merge
(MERGE_HEAD exists).". Perfect, I'm a git n00b.

I've tried to fix this with "git merge --abort", and indeed, gitmerge
didn't show any error next call. It also didn't show me further commits
to be merged. Likely, in its books the merge was finished, and it
regards everything merged fine.

Looking at the status at the master branch, I've seen that several
commits in emacs-26 didn't arrive master. I've tried to fix this by
several calls of "git cherry-pick ...". I hoped I have covered all
missing commits, but it seems that I've missed at least the commit for
NEWS. Maybe it would help if somebody is checking, whether I have
overseen other commits.

Summary: If everything goes well, gitmerge is great. In case of
problems, git n00bs like me are lost. It will take some time, until I
have enough courage to try it, again.

Best regards, Michael.

Re: master 01db800: Merge from origin/emacs-26

[Glenn Morris]

Michael Albinus wrote:

> I took your word that merging with gitmerge.el is pretty easy. It
> started well. During the merge, I was asked whether I want to apply the
> changes of NEWS to NEWS.26 in master. I confirmed.

Oh dear. Sorry, it was my fault.

I've successfully got gitmerge to send the changes from emacs-26
etc/NEWS to master etc/NEWS.26, but I'm missing a step in gitmerge that
would do the equivalent of running M-x gitmerge again after having
manually resolved the NEWS conflict. I don't see how to fix this right
now. <Looks around hopefully for gitmerge authors...>

This lack of proper rename tracking is so annoying that I'm tempted to
suggest etc/NEWS always be called etc/NEWS.MAJORVERSION right from the
start, with etc/NEWS perhaps being just a symlink. (Cue complaints about
platforms lacking symlinks.)

Re: master 01db800: Merge from origin/emacs-26

[Glenn Morris]

PS anyone can test this by:
make a new clone directory for master, and git reset --hard 728d259
emacs -Q -l /path/to/current/gitmerge.el
M-x gitmerge

Re: master 01db800: Merge from origin/emacs-26

[Michael Albinus]

Glenn Morris <rgm@gnu.org> writes:

> This lack of proper rename tracking is so annoying that I'm tempted to
> suggest etc/NEWS always be called etc/NEWS.MAJORVERSION right from the
> start, with etc/NEWS perhaps being just a symlink.

1+

Best regards, Michael.

Re: master 01db800: Merge from origin/emacs-26

[Eli Zaretskii]

> From: Glenn Morris <rgm@gnu.org>
> Date: Mon, 11 Dec 2017 13:21:20 -0500
> Cc: emacs-devel@gnu.org
> 
> This lack of proper rename tracking is so annoying that I'm tempted to
> suggest etc/NEWS always be called etc/NEWS.MAJORVERSION right from the
> start, with etc/NEWS perhaps being just a symlink. (Cue complaints about
> platforms lacking symlinks.)

Instead of a symlink, we could rename it to NEWS as part of tarring
the release, I think.

Re: master 01db800: Merge from origin/emacs-26

[Glenn Morris]

Eli Zaretskii wrote:

> Instead of a symlink, we could rename it to NEWS as part of tarring
> the release, I think.

That would leave NEWS non-existing in uninstalled builds.
I think this would be a real PITA when developing.

The gitmerge thing is fixable, I think. Suggestion at
https://debbugs.gnu.org/29366#8

Re: master 01db800: Merge from origin/emacs-26

[Eli Zaretskii]

> From: Glenn Morris <rgm@gnu.org>
> Cc: michael.albinus@gmx.de,  emacs-devel@gnu.org
> Date: Mon, 11 Dec 2017 14:14:53 -0500
> 
> Eli Zaretskii wrote:
> 
> > Instead of a symlink, we could rename it to NEWS as part of tarring
> > the release, I think.
> 
> That would leave NEWS non-existing in uninstalled builds.
> I think this would be a real PITA when developing.

Then perhaps building Emacs could symlink NEWS where symlinks are
supported and copy it where it isn't.

> The gitmerge thing is fixable, I think.

If it is, that's better.

Re: master 01db800: Merge from origin/emacs-26

[Glenn Morris]

Eli Zaretskii wrote:

> Then perhaps building Emacs could symlink NEWS where symlinks are
> supported and copy it where it isn't.

Maybe that would be good enough, but personally I think I want
etc/NEWS to exist even in unbuilt trees.

(For the historical record: bzr does proper rename tracking and does not
have this issue.)

Re: master 01db800: Merge from origin/emacs-26

[Richard Stallman]

[[[ To any NSA and FBI agents reading my email: please consider    ]]]
[[[ whether defending the US Constitution against all enemies,     ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]

  > Maybe that would be good enough, but personally I think I want
  > etc/NEWS to exist even in unbuilt trees.

I agree.

-- 
Dr Richard Stallman
President, Free Software Foundation (https://gnu.org, https://fsf.org)
Internet Hall-of-Famer (https://internethalloffame.org)
Skype: No way! See https://stallman.org/skype.html.