all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Eli Zaretskii <eliz@gnu.org>
Cc: Chong Yidong <cyd@gnu.org>, emacs-devel@gnu.org
Subject: Re: Marge from emacs-24
Date: Fri, 21 Sep 2012 09:07:59 -0400	[thread overview]
Message-ID: <jwvsjabv85a.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <83sjabyhnl.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 21 Sep 2012 10:11:26 +0300")

>> > 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



      reply	other threads:[~2012-09-21 13:07 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 [this message]

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=jwvsjabv85a.fsf-monnier+emacs@gnu.org \
    --to=monnier@iro.umontreal.ca \
    --cc=cyd@gnu.org \
    --cc=eliz@gnu.org \
    --cc=emacs-devel@gnu.org \
    /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.