From: Eli Zaretskii <eliz@gnu.org>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: emacs-devel@gnu.org
Subject: Re: Strange ChangeLog entry after merge from emacs-24
Date: Mon, 08 Dec 2014 19:12:09 +0200 [thread overview]
Message-ID: <83k322xdzq.fsf@gnu.org> (raw)
In-Reply-To: <jwvr3wbp3bv.fsf-monnier+emacs@gnu.org>
> From: Stefan Monnier <monnier@iro.umontreal.ca>
> Cc: emacs-devel@gnu.org
> Date: Sun, 07 Dec 2014 16:18:04 -0500
>
> >> 2014-12-05 Paul Eggert <eggert@cs.ucla.edu>
> >> 2014-12-05 Eli Zaretskii <eliz@gnu.org>
> >>
> >> * .gitignore: Ignore test/biditest.txt.
> >>
> >> What happened here? Not that it was a significant contribution for
> >> which I'd object sharing the credit with Paul, but there might be a
> >> larger merging problem hiding behind this.
> >>
> >> What am I missing?
>
> > Ping!
> > Should I fix that entry and forget about this?
>
> I think so, yes.
Done.
Btw, it also happened in another entry in src/ChangeLog:
2014-12-05 Eli Zaretskii <eliz@gnu.org>
2014-12-05 Eli Zaretskii <eliz@gnu.org>
* dispextern.h (enum bidi_dir_t): Force NEUTRAL_DIR to be zero.
(struct bidi_stack): Reduce size by using bit fields and by
packing sos, override, and isolate_status into a single 8-bit
byte called 'flags'.
So there definitely was some problem in that merge.
(And what's with "merge from emacs-24" followed by "merge from
origin/emacs-24"?)
next prev parent reply other threads:[~2014-12-08 17:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-06 8:36 Strange ChangeLog entry after merge from emacs-24 Eli Zaretskii
2014-12-07 17:42 ` Eli Zaretskii
2014-12-07 21:18 ` Stefan Monnier
2014-12-08 17:12 ` Eli Zaretskii [this message]
2014-12-08 17:17 ` Glenn Morris
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=83k322xdzq.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=monnier@iro.umontreal.ca \
/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.