From: Glenn Morris <rgm@gnu.org>
To: Michael Albinus <michael.albinus@gmx.de>
Cc: emacs-devel@gnu.org
Subject: Re: master 01db800: Merge from origin/emacs-26
Date: Mon, 11 Dec 2017 13:21:20 -0500 [thread overview]
Message-ID: <fawp1tktwf.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <877etv6imw.fsf@gmx.de> (Michael Albinus's message of "Sun, 10 Dec 2017 10:23:51 +0100")
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.)
next prev parent reply other threads:[~2017-12-11 18:21 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[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 [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fawp1tktwf.fsf@fencepost.gnu.org \
--to=rgm@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=michael.albinus@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.