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 19:37:34 +0200 Message-ID: <83hbebf0dd.fsf@gnu.org> References: <83zks4fkua.fsf@gnu.org> <83sjxwf18y.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1292693861 10020 80.91.229.12 (18 Dec 2010 17:37:41 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 18 Dec 2010 17:37:41 +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 18:37:37 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 1PU0iv-00053P-5I for ged-emacs-devel@m.gmane.org; Sat, 18 Dec 2010 18:37:37 +0100 Original-Received: from localhost ([127.0.0.1]:59974 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PU0iu-0002lj-Iq for ged-emacs-devel@m.gmane.org; Sat, 18 Dec 2010 12:37:36 -0500 Original-Received: from [140.186.70.92] (port=33281 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PU0ip-0002kH-Dn for emacs-devel@gnu.org; Sat, 18 Dec 2010 12:37:32 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PU0io-0005PW-1j for emacs-devel@gnu.org; Sat, 18 Dec 2010 12:37:31 -0500 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:59289) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PU0in-0005PJ-QT for emacs-devel@gnu.org; Sat, 18 Dec 2010 12:37:30 -0500 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0LDM00I00WXTZV00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Sat, 18 Dec 2010 19:37:27 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([84.229.167.122]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0LDM00IVXWYDFP50@a-mtaout22.012.net.il>; Sat, 18 Dec 2010 19:37:27 +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:133798 Archived-At: > From: Stefan Monnier > Cc: emacs-devel@gnu.org > Date: Sat, 18 Dec 2010 10:58:14 -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? > > By history tracking I mean keeping track of what has been merged where > and when. Okay, then how about including with the merge commit message the list of revisions you backed out after merging? This list cannot be too long (otherwise merging doesn't make sense). Until now we only had a laconic "merge from emacs-23" as the log message. > > 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 > > Yup. This is a non-issue. It will be a non-issue if there's a way to know that 99634.2.670 was reverse cherry-picked after merging. Otherwise, how can I distinguish between this case and the case of erroneously merging from the branch (which happened in the past)?