From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: emacs-24 r107805: international/characters.el: Fix sorting. Date: Tue, 10 Apr 2012 14:37:40 -0400 Message-ID: References: <834nsr7cia.fsf@gnu.org> <8kr4vvwlf5.fsf@fencepost.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1334083078 5370 80.91.229.3 (10 Apr 2012 18:37:58 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 10 Apr 2012 18:37:58 +0000 (UTC) Cc: Eli Zaretskii , Andreas Schwab , emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 10 20:37:57 2012 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1SHfwy-0006wz-PD for ged-emacs-devel@m.gmane.org; Tue, 10 Apr 2012 20:37:56 +0200 Original-Received: from localhost ([::1]:41344 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SHfwy-0003dh-5r for ged-emacs-devel@m.gmane.org; Tue, 10 Apr 2012 14:37:56 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:39457) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SHfwt-0003cB-Tk for emacs-devel@gnu.org; Tue, 10 Apr 2012 14:37:54 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SHfws-0002tt-CC for emacs-devel@gnu.org; Tue, 10 Apr 2012 14:37:51 -0400 Original-Received: from pruche.dit.umontreal.ca ([132.204.246.22]:47979) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SHfwm-0002sY-Ir; Tue, 10 Apr 2012 14:37:44 -0400 Original-Received: from faina.iro.umontreal.ca (lechon.iro.umontreal.ca [132.204.27.242]) by pruche.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id q3AIbfUn018899; Tue, 10 Apr 2012 14:37:41 -0400 Original-Received: by faina.iro.umontreal.ca (Postfix, from userid 20848) id DC56AB40D6; Tue, 10 Apr 2012 14:37:40 -0400 (EDT) In-Reply-To: <8kr4vvwlf5.fsf@fencepost.gnu.org> (Glenn Morris's message of "Tue, 10 Apr 2012 13:23:26 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.94 (gnu/linux) X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV4188=0 X-NAI-Spam-Version: 2.2.0.9309 : core <4188> : streams <745746> : uri <1097874> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 132.204.246.22 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:149577 Archived-At: > 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