* Marge from emacs-24
@ 2012-09-20 18:36 Eli Zaretskii
2012-09-21 3:08 ` Chong Yidong
0 siblings, 1 reply; 4+ messages in thread
From: Eli Zaretskii @ 2012-09-20 18:36 UTC (permalink / raw)
To: emacs-devel
A couple of critical bugfixes were committed to the emacs-24 branch
lately, but the last merge from there was almost 3 weeks ago. Can it
be merged again, please?
TIA
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Marge from emacs-24
2012-09-20 18:36 Marge from emacs-24 Eli Zaretskii
@ 2012-09-21 3:08 ` Chong Yidong
2012-09-21 7:11 ` Eli Zaretskii
0 siblings, 1 reply; 4+ messages in thread
From: Chong Yidong @ 2012-09-21 3:08 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: emacs-devel
Eli Zaretskii <eliz@gnu.org> writes:
> A couple of critical bugfixes were committed to the emacs-24 branch
> lately, but the last merge from there was almost 3 weeks ago. Can it
> be merged again, please?
Done.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Marge from emacs-24
2012-09-21 3:08 ` Chong Yidong
@ 2012-09-21 7:11 ` Eli Zaretskii
2012-09-21 13:07 ` Stefan Monnier
0 siblings, 1 reply; 4+ messages in thread
From: Eli Zaretskii @ 2012-09-21 7:11 UTC (permalink / raw)
To: Chong Yidong; +Cc: emacs-devel
> From: Chong Yidong <cyd@gnu.org>
> Cc: emacs-devel@gnu.org
> Date: Fri, 21 Sep 2012 11:08:11 +0800
>
> Eli Zaretskii <eliz@gnu.org> writes:
>
> > A couple of critical bugfixes were committed to the emacs-24 branch
> > lately, but the last merge from there was almost 3 weeks ago. Can it
> > be merged again, please?
>
> Done.
Thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Marge from emacs-24
2012-09-21 7:11 ` Eli Zaretskii
@ 2012-09-21 13:07 ` Stefan Monnier
0 siblings, 0 replies; 4+ messages in thread
From: Stefan Monnier @ 2012-09-21 13:07 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: Chong Yidong, emacs-devel
>> > A couple of critical bugfixes were committed to the emacs-24 branch
>> > lately, but the last merge from there was almost 3 weeks ago. Can it
>> > be merged again, please?
>> Done.
> Thanks.
BTW, normally anyone can do such a merge. Basically, you should be able
to do something like:
M-x load-file RET .../admin/bzrmerge RET
M-x cd RET .../trunk RET
M-x bzrmerge RET .../emacs-24 RET
... hopefully everything works ...
... take-a look-at-the result and when everything looks good ...
bzr commit -m 'Merge from emacs-24'
Stefan
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-09-21 13:07 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-20 18:36 Marge from emacs-24 Eli Zaretskii
2012-09-21 3:08 ` Chong Yidong
2012-09-21 7:11 ` Eli Zaretskii
2012-09-21 13:07 ` Stefan Monnier
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).