From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Sven Joachim Newsgroups: gmane.emacs.devel Subject: Re: Confusing "bzr log" as result of merges Date: Sat, 21 May 2011 12:57:19 +0200 Message-ID: <87ipt4l3sg.fsf@turtle.gmx.de> References: <83ipt4fqyy.fsf@gnu.org> <837h9kfidh.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1305975451 29425 80.91.229.12 (21 May 2011 10:57:31 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 21 May 2011 10:57:31 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat May 21 12:57:27 2011 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1QNjs5-0005Ej-Lv for ged-emacs-devel@m.gmane.org; Sat, 21 May 2011 12:57:25 +0200 Original-Received: from localhost ([::1]:35625 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNjs4-0005Ei-Pc for ged-emacs-devel@m.gmane.org; Sat, 21 May 2011 06:57:24 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:50509) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNjs2-0005Ed-Cf for emacs-devel@gnu.org; Sat, 21 May 2011 06:57:23 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QNjs1-0004vz-Gx for emacs-devel@gnu.org; Sat, 21 May 2011 06:57:22 -0400 Original-Received: from mailout-de.gmx.net ([213.165.64.23]:45645) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1QNjs1-0004vp-1Z for emacs-devel@gnu.org; Sat, 21 May 2011 06:57:21 -0400 Original-Received: (qmail invoked by alias); 21 May 2011 10:57:19 -0000 Original-Received: from p4FF8927E.dip.t-dialin.net (EHLO turtle.gmx.de) [79.248.146.126] by mail.gmx.net (mp021) with SMTP; 21 May 2011 12:57:19 +0200 X-Authenticated: #28250155 X-Provags-ID: V01U2FsdGVkX1/ICeN3+nLI/YQ7hE0grH7oTnxwxu+MRTbfoflMq7 yqulMib/fvsTJ1 Original-Received: by turtle.gmx.de (Postfix, from userid 1000) id 3CD9B3F5F4; Sat, 21 May 2011 12:57:20 +0200 (CEST) In-Reply-To: <837h9kfidh.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 21 May 2011 13:38:50 +0300") User-Agent: Gnus/5.110017 (No Gnus v0.17) Emacs/23.3.50 (gnu/linux) X-Y-GMX-Trusted: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 213.165.64.23 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:139586 Archived-At: On 2011-05-21 12:38 +0200, Eli Zaretskii wrote: >> Date: Sat, 21 May 2011 10:33:09 +0300 >> From: Eli Zaretskii >> >> What can we do to avoid this confusion as result of merges? And why >> was 99634.2.937 merged to the trunk, even though the log message >> clearly says it's a backport? If we avoid merging such backported >> revisions, will this problem go away? > > On second thought, maybe it's my fault, in that I merged from trunk to > emacs-23, instead of just copying the code? No, you only merged a few revisions which is a cherry-pick and not recorded as a merge. > Should we refrain from > merging from trunk to emacs-23, to avoid such confusion? Merging individual revisions is fine. Cheers, Sven