* Strange ChangeLog entry after merge from emacs-24
@ 2014-12-06 8:36 Eli Zaretskii
2014-12-07 17:42 ` Eli Zaretskii
0 siblings, 1 reply; 5+ messages in thread
From: Eli Zaretskii @ 2014-12-06 8:36 UTC (permalink / raw)
To: Stefan Monnier; +Cc: emacs-devel
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?
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Strange ChangeLog entry after merge from emacs-24
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
0 siblings, 1 reply; 5+ messages in thread
From: Eli Zaretskii @ 2014-12-07 17:42 UTC (permalink / raw)
To: monnier; +Cc: emacs-devel
> Date: Sat, 06 Dec 2014 10:36:31 +0200
> From: Eli Zaretskii <eliz@gnu.org>
> CC: emacs-devel@gnu.org
>
>
> 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?
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Strange ChangeLog entry after merge from emacs-24
2014-12-07 17:42 ` Eli Zaretskii
@ 2014-12-07 21:18 ` Stefan Monnier
2014-12-08 17:12 ` Eli Zaretskii
0 siblings, 1 reply; 5+ messages in thread
From: Stefan Monnier @ 2014-12-07 21:18 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: emacs-devel
>> 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.
Stefan
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: Strange ChangeLog entry after merge from emacs-24
2014-12-07 21:18 ` Stefan Monnier
@ 2014-12-08 17:12 ` Eli Zaretskii
2014-12-08 17:17 ` Glenn Morris
0 siblings, 1 reply; 5+ messages in thread
From: Eli Zaretskii @ 2014-12-08 17:12 UTC (permalink / raw)
To: Stefan Monnier; +Cc: emacs-devel
> 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"?)
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-12-08 17:17 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2014-12-08 17:17 ` Glenn Morris
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).