* Re: master 01db800: Merge from origin/emacs-26 [not found] ` <20171209102341.B679C20404@vcs0.savannah.gnu.org> @ 2017-12-09 20:58 ` Glenn Morris 2017-12-10 9:23 ` Michael Albinus 0 siblings, 1 reply; 10+ messages in thread From: Glenn Morris @ 2017-12-09 20:58 UTC (permalink / raw) To: emacs-devel; +Cc: Michael Albinus 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. ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: master 01db800: Merge from origin/emacs-26 2017-12-09 20:58 ` master 01db800: Merge from origin/emacs-26 Glenn Morris @ 2017-12-10 9:23 ` Michael Albinus 2017-12-11 18:21 ` Glenn Morris 0 siblings, 1 reply; 10+ messages in thread From: Michael Albinus @ 2017-12-10 9:23 UTC (permalink / raw) To: Glenn Morris; +Cc: emacs-devel 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. ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: master 01db800: Merge from origin/emacs-26 2017-12-10 9:23 ` Michael Albinus @ 2017-12-11 18:21 ` Glenn Morris 2017-12-11 18:26 ` Glenn Morris ` (2 more replies) 0 siblings, 3 replies; 10+ messages in thread From: Glenn Morris @ 2017-12-11 18:21 UTC (permalink / raw) To: Michael Albinus; +Cc: emacs-devel 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.) ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: master 01db800: Merge from origin/emacs-26 2017-12-11 18:21 ` Glenn Morris @ 2017-12-11 18:26 ` Glenn Morris 2017-12-11 18:27 ` Michael Albinus 2017-12-11 18:38 ` Eli Zaretskii 2 siblings, 0 replies; 10+ messages in thread From: Glenn Morris @ 2017-12-11 18:26 UTC (permalink / raw) To: Michael Albinus; +Cc: emacs-devel 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 ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: master 01db800: Merge from origin/emacs-26 2017-12-11 18:21 ` Glenn Morris 2017-12-11 18:26 ` Glenn Morris @ 2017-12-11 18:27 ` Michael Albinus 2017-12-11 18:38 ` Eli Zaretskii 2 siblings, 0 replies; 10+ messages in thread From: Michael Albinus @ 2017-12-11 18:27 UTC (permalink / raw) To: Glenn Morris; +Cc: emacs-devel 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. ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: master 01db800: Merge from origin/emacs-26 2017-12-11 18:21 ` Glenn Morris 2017-12-11 18:26 ` Glenn Morris 2017-12-11 18:27 ` Michael Albinus @ 2017-12-11 18:38 ` Eli Zaretskii 2017-12-11 19:14 ` Glenn Morris 2 siblings, 1 reply; 10+ messages in thread From: Eli Zaretskii @ 2017-12-11 18:38 UTC (permalink / raw) To: Glenn Morris; +Cc: michael.albinus, emacs-devel > 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. ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: master 01db800: Merge from origin/emacs-26 2017-12-11 18:38 ` Eli Zaretskii @ 2017-12-11 19:14 ` Glenn Morris 2017-12-11 19:34 ` Eli Zaretskii 0 siblings, 1 reply; 10+ messages in thread From: Glenn Morris @ 2017-12-11 19:14 UTC (permalink / raw) To: Eli Zaretskii; +Cc: michael.albinus, emacs-devel 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 ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: master 01db800: Merge from origin/emacs-26 2017-12-11 19:14 ` Glenn Morris @ 2017-12-11 19:34 ` Eli Zaretskii 2017-12-11 22:02 ` Glenn Morris 0 siblings, 1 reply; 10+ messages in thread From: Eli Zaretskii @ 2017-12-11 19:34 UTC (permalink / raw) To: Glenn Morris; +Cc: michael.albinus, emacs-devel > 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. ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: master 01db800: Merge from origin/emacs-26 2017-12-11 19:34 ` Eli Zaretskii @ 2017-12-11 22:02 ` Glenn Morris 2017-12-12 22:05 ` Richard Stallman 0 siblings, 1 reply; 10+ messages in thread From: Glenn Morris @ 2017-12-11 22:02 UTC (permalink / raw) To: Eli Zaretskii; +Cc: michael.albinus, emacs-devel 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.) ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: master 01db800: Merge from origin/emacs-26 2017-12-11 22:02 ` Glenn Morris @ 2017-12-12 22:05 ` Richard Stallman 0 siblings, 0 replies; 10+ messages in thread From: Richard Stallman @ 2017-12-12 22:05 UTC (permalink / raw) To: Glenn Morris; +Cc: eliz, michael.albinus, emacs-devel [[[ 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. ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2017-12-12 22:05 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20171209102340.2914.60218@vcs0.savannah.gnu.org>
[not found] ` <20171209102341.B679C20404@vcs0.savannah.gnu.org>
2017-12-09 20:58 ` master 01db800: Merge from origin/emacs-26 Glenn Morris
2017-12-10 9:23 ` Michael Albinus
2017-12-11 18:21 ` Glenn Morris
2017-12-11 18:26 ` Glenn Morris
2017-12-11 18:27 ` Michael Albinus
2017-12-11 18:38 ` Eli Zaretskii
2017-12-11 19:14 ` Glenn Morris
2017-12-11 19:34 ` Eli Zaretskii
2017-12-11 22:02 ` Glenn Morris
2017-12-12 22:05 ` Richard Stallman
Code repositories for project(s) associated with this public inbox https://git.savannah.gnu.org/cgit/emacs.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).