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: Latest merge from the emacs-23 branch Date: Sat, 18 Dec 2010 01:06:21 +0200 Message-ID: <83sjxwf18y.fsf@gnu.org> References: <83zks4fkua.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1292627188 31301 80.91.229.12 (17 Dec 2010 23:06:28 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 17 Dec 2010 23:06:28 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Dec 18 00:06:24 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PTjNX-0005gX-Gp for ged-emacs-devel@m.gmane.org; Sat, 18 Dec 2010 00:06:23 +0100 Original-Received: from localhost ([127.0.0.1]:36971 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PTjNX-0001Oq-1G for ged-emacs-devel@m.gmane.org; Fri, 17 Dec 2010 18:06:23 -0500 Original-Received: from [140.186.70.92] (port=58729 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PTjNS-0001LY-4q for emacs-devel@gnu.org; Fri, 17 Dec 2010 18:06:19 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PTjNQ-0004y6-IJ for emacs-devel@gnu.org; Fri, 17 Dec 2010 18:06:17 -0500 Original-Received: from mtaout21.012.net.il ([80.179.55.169]:38260) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PTjNQ-0004xm-9H for emacs-devel@gnu.org; Fri, 17 Dec 2010 18:06:16 -0500 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0LDL00C00H8W7U00@a-mtaout21.012.net.il> for emacs-devel@gnu.org; Sat, 18 Dec 2010 01:06:14 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([84.229.167.122]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0LDL00BPSHIDYT70@a-mtaout21.012.net.il>; Sat, 18 Dec 2010 01:06:14 +0200 (IST) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:133779 Archived-At: > From: Stefan Monnier > Cc: emacs-devel@gnu.org > Date: Fri, 17 Dec 2010 17:03:01 -0500 > > Cherrypicking is unworkable since it means doing all the > history-tracking by hand. What do you mean by "history-tracking", and why do we need to do it by hand? > I'm not sure what you mean by "some of them are not actually > included in the merge", tho. AFAIK they are included in the sense > that the corresponding change is now present on the trunk. No, there actually seem to be 2 different revisions on the trunk now that appear to solve the same issue in two different ways. For example, this "merge": 99634.2.670: Eli Zaretskii 2010-12-11 Fix bug #7398 with truncated glyphs is also present here: 102637: Eli Zaretskii 2010-12-11 Fix bug #7398 with truncated glyphs and this "merge": 99634.2.658: Eli Zaretskii 2010-12-09 Fix bug #1077 with popping new frames is also here: 102619: Eli Zaretskii 2010-12-09 Fix bug #1077 with popping new frames E.g., try these two commands: bzr diff -c99634.2.670 bzr diff -c102637 and you will see 2 different changes that seem to fix the same bug in two slightly different ways. Moreover, "bzr log -c99634.2.658" displays this: revno: 99634.2.658 fixes bug(s): http://debbugs.gnu.org/1077 committer: Eli Zaretskii branch nick: emacs-23 timestamp: Thu 2010-12-09 18:53:17 +0000 message: Fix bug #1077 with popping new frames from a minibuffer-only frame. Do NOT merge with trunk! ^^^^^^^^^^^^^^^^^^^^^^^^ Reading such log messages will result in a lot of confusion, I'm afraid.