From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Eli Zaretskii <eliz@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: Confusing "bzr log" as result of merges
Date: Sat, 21 May 2011 17:46:56 +0300
Message-ID: <83zkmgdsbj.fsf@gnu.org>
References: <83ipt4fqyy.fsf@gnu.org> <837h9kfidh.fsf@gnu.org>
	<831uzsfbme.fsf@gnu.org> <m2pqncmaxm.fsf@igel.home>
Reply-To: Eli Zaretskii <eliz@gnu.org>
NNTP-Posting-Host: lo.gmane.org
X-Trace: dough.gmane.org 1305989228 32605 80.91.229.12 (21 May 2011 14:47:08 GMT)
X-Complaints-To: usenet@dough.gmane.org
NNTP-Posting-Date: Sat, 21 May 2011 14:47:08 +0000 (UTC)
Cc: emacs-devel@gnu.org
To: Andreas Schwab <schwab@linux-m68k.org>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat May 21 16:47:04 2011
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
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 <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1QNnSI-0001cI-Gx
	for ged-emacs-devel@m.gmane.org; Sat, 21 May 2011 16:47:02 +0200
Original-Received: from localhost ([::1]:60697 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1QNnSH-0005TJ-NX
	for ged-emacs-devel@m.gmane.org; Sat, 21 May 2011 10:47:01 -0400
Original-Received: from eggs.gnu.org ([140.186.70.92]:41555)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eliz@gnu.org>) id 1QNnSE-0005Sr-M8
	for emacs-devel@gnu.org; Sat, 21 May 2011 10:46:59 -0400
Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eliz@gnu.org>) id 1QNnSD-0001Cr-Ls
	for emacs-devel@gnu.org; Sat, 21 May 2011 10:46:58 -0400
Original-Received: from mtaout22.012.net.il ([80.179.55.172]:34756)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <eliz@gnu.org>)
	id 1QNnSD-0001CZ-Ee
	for emacs-devel@gnu.org; Sat, 21 May 2011 10:46:57 -0400
Original-Received: from conversion-daemon.a-mtaout22.012.net.il by
	a-mtaout22.012.net.il (HyperSendmail v2007.08) id
	<0LLJ00B00VI9A900@a-mtaout22.012.net.il> for
	emacs-devel@gnu.org; Sat, 21 May 2011 17:46:55 +0300 (IDT)
Original-Received: from HOME-C4E4A596F7 ([77.124.254.13]) by a-mtaout22.012.net.il
	(HyperSendmail v2007.08) with ESMTPA id
	<0LLJ00B26VQ3AB10@a-mtaout22.012.net.il>;
	Sat, 21 May 2011 17:46:52 +0300 (IDT)
In-reply-to: <m2pqncmaxm.fsf@igel.home>
X-012-Sender: halo1@inter.net.il
X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta)
X-Received-From: 80.179.55.172
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: </archive/html/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=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:139593
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/139593>

> From: Andreas Schwab <schwab@linux-m68k.org>
> Cc: emacs-devel@gnu.org
> Date: Sat, 21 May 2011 15:37:41 +0200
> 
> Eli Zaretskii <eliz@gnu.org> writes:
> 
> > 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.
> 
> Apart from the fact that nothing was "reverse cherry-picked", how would
> that change anything?

See admin/bzrmerge.el.