From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.devel Subject: Re: emacs-24 r107805: international/characters.el: Fix sorting. Date: Tue, 10 Apr 2012 13:23:26 -0400 Message-ID: <8kr4vvwlf5.fsf@fencepost.gnu.org> References: <834nsr7cia.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1334078620 738 80.91.229.3 (10 Apr 2012 17:23:40 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 10 Apr 2012 17:23:40 +0000 (UTC) Cc: Andreas Schwab , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 10 19:23:39 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 1SHen3-0008T4-69 for ged-emacs-devel@m.gmane.org; Tue, 10 Apr 2012 19:23:37 +0200 Original-Received: from localhost ([::1]:33820 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SHen2-0001pV-9d for ged-emacs-devel@m.gmane.org; Tue, 10 Apr 2012 13:23:36 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:57854) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SHemy-0001pN-R8 for emacs-devel@gnu.org; Tue, 10 Apr 2012 13:23:34 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SHemv-0003mD-Ok for emacs-devel@gnu.org; Tue, 10 Apr 2012 13:23:32 -0400 Original-Received: from fencepost.gnu.org ([208.118.235.10]:42019) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SHemv-0003m9-Ls for emacs-devel@gnu.org; Tue, 10 Apr 2012 13:23:29 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1SHems-0006mq-VZ; Tue, 10 Apr 2012 13:23:27 -0400 X-Spook: Lexis-Nexis plutonium halcon lynch USDOJ Rand Corporation X-Ran: V8|Jbq%M~^(prY (Eli Zaretskii's message of "Tue, 10 Apr 2012 19:55:09 +0300") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 208.118.235.10 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:149572 Archived-At: Eli Zaretskii wrote: > the future merge from the branch harder, because there will be > conflicts. 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. BTW, to check my understanding: After 24.1 is released, trunk will be merged to emacs-24 in preparation for making 24.2 on the emacs-24 branch. In the meantime, emacs-24 can be merged to the trunk at any time. Is that right?