From: Stefan Monnier <monnier@IRO.UMontreal.CA>
To: Glenn Morris <rgm@gnu.org>
Cc: Eli Zaretskii <eliz@gnu.org>,
Andreas Schwab <schwab@linux-m68k.org>,
emacs-devel@gnu.org
Subject: Re: emacs-24 r107805: international/characters.el: Fix sorting.
Date: Tue, 10 Apr 2012 14:37:40 -0400 [thread overview]
Message-ID: <jwvr4vvtoxc.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <8kr4vvwlf5.fsf@fencepost.gnu.org> (Glenn Morris's message of "Tue, 10 Apr 2012 13:23:26 -0400")
> This won't be (as much of) a problem if the commits to the emacs-24
> branch are labelled as "backport from trunk" or "merge from trunk" when
> appropriate. Basically anything that bzrmerge-skip-regexp can recognize.
Yes, but better not abuse this.
> After 24.1 is released, trunk will be merged to emacs-24 in preparation
> for making 24.2 on the emacs-24 branch.
"After", yes, but not "right after". IOW rather than "after 24.1", I'd
say "before the 24.2 release".
> In the meantime, emacs-24 can be merged to the trunk at any time.
Yes.
Stefan
next prev parent reply other threads:[~2012-04-10 18:37 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-10 16:55 emacs-24 r107805: international/characters.el: Fix sorting Eli Zaretskii
2012-04-10 17:23 ` Glenn Morris
2012-04-10 18:19 ` Eli Zaretskii
2012-04-10 18:37 ` Stefan Monnier [this message]
2012-04-10 18:57 ` Andreas Schwab
2012-04-10 19:09 ` Eli Zaretskii
2012-04-10 20:52 ` Andreas Schwab
2012-04-11 6:46 ` Eli Zaretskii
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwvr4vvtoxc.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=rgm@gnu.org \
--cc=schwab@linux-m68k.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 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).