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: Release branch plans Date: Mon, 02 Apr 2012 20:53:02 +0300 Message-ID: <83zkauc96p.fsf@gnu.org> References: <87d37q7ld4.fsf@gnu.org> <871uo6puac.fsf@gnu.org> <83ty12hxoa.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: dough.gmane.org 1333389196 27038 80.91.229.3 (2 Apr 2012 17:53:16 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 2 Apr 2012 17:53:16 +0000 (UTC) Cc: cyd@gnu.org, emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Apr 02 19:53:13 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 1SElRI-0007Tp-M7 for ged-emacs-devel@m.gmane.org; Mon, 02 Apr 2012 19:53:12 +0200 Original-Received: from localhost ([::1]:44266 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SElRI-0001nF-5I for ged-emacs-devel@m.gmane.org; Mon, 02 Apr 2012 13:53:12 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:52526) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SElRB-0001mu-Jd for emacs-devel@gnu.org; Mon, 02 Apr 2012 13:53:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SElRA-0004Dr-2M for emacs-devel@gnu.org; Mon, 02 Apr 2012 13:53:05 -0400 Original-Received: from mtaout23.012.net.il ([80.179.55.175]:44805) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SElR4-0004D2-KB; Mon, 02 Apr 2012 13:52:59 -0400 Original-Received: from conversion-daemon.a-mtaout23.012.net.il by a-mtaout23.012.net.il (HyperSendmail v2007.08) id <0M1V00H005KKF300@a-mtaout23.012.net.il>; Mon, 02 Apr 2012 20:52:56 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([84.228.100.223]) by a-mtaout23.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0M1V00HT05O59N80@a-mtaout23.012.net.il>; Mon, 02 Apr 2012 20:52:56 +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.175 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:149295 Archived-At: > From: Andreas Schwab > Cc: Chong Yidong , emacs-devel@gnu.org > Date: Mon, 02 Apr 2012 19:21:55 +0200 > > Eli Zaretskii writes: > > > Could we _please_ do it the other way around this time? That is, > > commit to the trunk and merge to the branch? > > How can that be correct? Most of the trunk commits are not supposed to > occur on the release branch. As long as not all branch commits are merged to the trunk, we already know how to cope with this problem. > > Merging from the branch makes it hard to find out where some changes > > came from and why, because history metadata says some revisions were > > merged, but their code was not really brought to the target branch. > > Merges are supposed to merge everything. Yes, except they don't.