From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: Confusing "bzr log" as result of merges Date: Sat, 21 May 2011 19:06:32 +0200 Message-ID: References: <83ipt4fqyy.fsf@gnu.org> <87ei3s2fdm.fsf@wanadoo.es> <87aaeg2dl7.fsf@wanadoo.es> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: dough.gmane.org 1305997608 10569 80.91.229.12 (21 May 2011 17:06:48 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 21 May 2011 17:06:48 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?utf-8?Q?=C3=93scar?= Fuentes Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat May 21 19:06:42 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 1QNpdR-0001nz-CU for ged-emacs-devel@m.gmane.org; Sat, 21 May 2011 19:06:41 +0200 Original-Received: from localhost ([::1]:47287 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNpdP-0006Ev-Qi for ged-emacs-devel@m.gmane.org; Sat, 21 May 2011 13:06:39 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:41071) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNpdM-0006Eq-QZ for emacs-devel@gnu.org; Sat, 21 May 2011 13:06:37 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QNpdL-00041E-Mx for emacs-devel@gnu.org; Sat, 21 May 2011 13:06:36 -0400 Original-Received: from mail-out.m-online.net ([212.18.0.9]:55323) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNpdL-000419-Es for emacs-devel@gnu.org; Sat, 21 May 2011 13:06:35 -0400 Original-Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 5694C1C1DA06; Sat, 21 May 2011 19:06:33 +0200 (CEST) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.8.164]) by mail.m-online.net (Postfix) with ESMTP id 548A61C000B0; Sat, 21 May 2011 19:06:33 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.180]) by localhost (dynscan1.mail.m-online.net [192.168.8.164]) (amavisd-new, port 10024) with ESMTP id hSUW-Vi-nc+x; Sat, 21 May 2011 19:06:33 +0200 (CEST) Original-Received: from igel.home (ppp-88-217-118-52.dynamic.mnet-online.de [88.217.118.52]) by mail.mnet-online.de (Postfix) with ESMTP; Sat, 21 May 2011 19:06:32 +0200 (CEST) Original-Received: by igel.home (Postfix, from userid 501) id 7AF29CA29C; Sat, 21 May 2011 19:06:32 +0200 (CEST) X-Yow: I want to dress you up as TALLULAH BANKHEAD and cover you with VASELINE and WHEAT THINS.. In-Reply-To: <87aaeg2dl7.fsf@wanadoo.es> (=?utf-8?Q?=22=C3=93scar?= Fuentes"'s message of "Sat, 21 May 2011 19:00:36 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 212.18.0.9 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:139602 Archived-At: Óscar Fuentes writes: > You don't know with 100% reliability. If a change committed into > emacs-common does not belong there, do the same you do with the rest of > wrong commits: revert it. I'm talking about the commits in the trunk that also belong in the emacs-23 branch. You either have to cherry-pick them into the emacs-common branch, or into the emacs-23 branch. Still the same duplication as we have now. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."