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: Confusing "bzr log" as result of merges Date: Sat, 21 May 2011 16:04:41 +0300 Message-ID: <831uzsfbme.fsf@gnu.org> References: <83ipt4fqyy.fsf@gnu.org> <837h9kfidh.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1305983099 1554 80.91.229.12 (21 May 2011 13:04:59 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 21 May 2011 13:04:59 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat May 21 15:04:54 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 1QNlrP-00064j-49 for ged-emacs-devel@m.gmane.org; Sat, 21 May 2011 15:04:51 +0200 Original-Received: from localhost ([::1]:35026 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNlrO-0003ig-Cu for ged-emacs-devel@m.gmane.org; Sat, 21 May 2011 09:04:50 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:37208) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNlrL-0003iZ-LI for emacs-devel@gnu.org; Sat, 21 May 2011 09:04:48 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QNlrK-0003fg-Le for emacs-devel@gnu.org; Sat, 21 May 2011 09:04:47 -0400 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:57145) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNlrK-0003fa-Cs for emacs-devel@gnu.org; Sat, 21 May 2011 09:04:46 -0400 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0LLJ00500QQBMY00@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Sat, 21 May 2011 16:04:44 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([77.124.254.13]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0LLJ0058LQZP4W90@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Sat, 21 May 2011 16:04:38 +0300 (IDT) In-reply-to: <837h9kfidh.fsf@gnu.org> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) 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:139590 Archived-At: > Date: Sat, 21 May 2011 13:38:50 +0300 > From: Eli Zaretskii > > > 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? Should we refrain from > merging from trunk to emacs-23, to avoid such confusion? On third thought, this seems to be an artifact of how we merge from emacs-23. I already complained about this in the past, see https://lists.gnu.org/archive/html/emacs-devel/2010-12/msg00504.html In that discussion, we agreed to mention in the commit message the versions that were reverse cherry-picked. But it looks like that agreement was never acted upon.