From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: emacs-24 r107805: international/characters.el: Fix sorting. Date: Tue, 10 Apr 2012 22:09:37 +0300 Message-ID: <83vcl75rpq.fsf@gnu.org> References: <834nsr7cia.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: dough.gmane.org 1334085107 22171 80.91.229.3 (10 Apr 2012 19:11:47 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 10 Apr 2012 19:11:47 +0000 (UTC) Cc: emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 10 21:11:44 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 1SHgTg-0000MT-GD for ged-emacs-devel@m.gmane.org; Tue, 10 Apr 2012 21:11:44 +0200 Original-Received: from localhost ([::1]:55083 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SHgTf-00066B-Qs for ged-emacs-devel@m.gmane.org; Tue, 10 Apr 2012 15:11:43 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:38588) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SHgTX-00065P-KL for emacs-devel@gnu.org; Tue, 10 Apr 2012 15:11:41 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SHgTT-00052n-FW for emacs-devel@gnu.org; Tue, 10 Apr 2012 15:11:35 -0400 Original-Received: from mtaout21.012.net.il ([80.179.55.169]:45739) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SHgTT-00052W-7p for emacs-devel@gnu.org; Tue, 10 Apr 2012 15:11:31 -0400 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0M2A006002ILUL00@a-mtaout21.012.net.il> for emacs-devel@gnu.org; Tue, 10 Apr 2012 22:11:29 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([84.229.57.204]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0M2A006EU2N3TQK0@a-mtaout21.012.net.il>; Tue, 10 Apr 2012 22:11:29 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) X-Received-From: 80.179.55.169 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:149580 Archived-At: > From: Andreas Schwab > Cc: emacs-devel@gnu.org > Date: Tue, 10 Apr 2012 20:57:17 +0200 > > Eli Zaretskii writes: > > > Andreas, if you want to change things in this area, please either make > > the same changes on the trunk, > > No. Commits should be merged, not copied. Then please remove the trunk changes. > > The way you do it you make the future merge from the branch harder, > > because there will be conflicts. > > You were the one to introduce the conflict. Actually, I fixed it. But suit yourself.