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 and trunk Date: Wed, 18 Jun 2014 20:30:18 +0300 Message-ID: <83mwdat9at.fsf@gnu.org> References: <53A1C860.4000505@yandex.ru> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1403112643 25086 80.91.229.3 (18 Jun 2014 17:30:43 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 18 Jun 2014 17:30:43 +0000 (UTC) Cc: monnier@IRO.UMontreal.CA, emacs-devel@gnu.org To: Dmitry Antipov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jun 18 19:30:37 2014 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 1WxJgz-0005rm-Ns for ged-emacs-devel@m.gmane.org; Wed, 18 Jun 2014 19:30:37 +0200 Original-Received: from localhost ([::1]:59578 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxJgz-0003Na-9y for ged-emacs-devel@m.gmane.org; Wed, 18 Jun 2014 13:30:37 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56920) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxJgs-0003MB-Gg for emacs-devel@gnu.org; Wed, 18 Jun 2014 13:30:35 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WxJgm-00035K-KF for emacs-devel@gnu.org; Wed, 18 Jun 2014 13:30:30 -0400 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:40691) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxJgm-00034x-CJ for emacs-devel@gnu.org; Wed, 18 Jun 2014 13:30:24 -0400 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0N7D00400KM65V00@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Wed, 18 Jun 2014 20:30:22 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0N7D0038BKMLZS30@a-mtaout20.012.net.il>; Wed, 18 Jun 2014 20:30:22 +0300 (IDT) In-reply-to: <53A1C860.4000505@yandex.ru> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.166 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:172507 Archived-At: > Date: Wed, 18 Jun 2014 21:12:00 +0400 > From: Dmitry Antipov > Cc: Stefan Monnier > > Can someone explain how the fixes are propagated between emacs-24 and trunk > branches? >From time to time, someone merges from emacs-24 onto the trunk using admin/bzrmerge.el. > I believe that http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17771 > is important enough to get it fixed everywhere as soon as possible; should > I fix it in both emacs-24 and trunk, or it will be merged from trunk somehow? Fix in emacs-24, and it will be merged to trunk soon. Thanks.