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: git transition issues Date: Fri, 31 Oct 2014 12:27:21 +0200 Message-ID: <83fve4zg8m.fsf@gnu.org> References: <20141027000718.F09B5382A66@snark.thyrsus.com> <20141027012827.GA10163@thyrsus.com> <20141028163655.GB10490@thyrsus.com> <8361f42hw9.fsf@gnu.org> <20141028180738.GA13564@thyrsus.com> <8338a82h1g.fsf@gnu.org> <83ioj0zjgn.fsf@gnu.org> <20141031102322.GB26371@thyrsus.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1414772731 2923 80.91.229.3 (31 Oct 2014 16:25:31 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 31 Oct 2014 16:25:31 +0000 (UTC) Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org To: esr@thyrsus.com Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Oct 31 17:25:23 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XkF0q-0000Yg-OV for ged-emacs-devel@m.gmane.org; Fri, 31 Oct 2014 17:25:20 +0100 Original-Received: from localhost ([::1]:38909 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XkF0q-0007wF-9A for ged-emacs-devel@m.gmane.org; Fri, 31 Oct 2014 12:25:20 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34747) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XkDn8-0001Dy-Jp for emacs-devel@gnu.org; Fri, 31 Oct 2014 11:07:33 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xk9QX-0001MH-Vr for emacs-devel@gnu.org; Fri, 31 Oct 2014 06:27:39 -0400 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:32793) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xk9QX-0001Kl-Oa for emacs-devel@gnu.org; Fri, 31 Oct 2014 06:27:29 -0400 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0NEB00B000OALT00@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Fri, 31 Oct 2014 12:27:28 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NEB00B1H11OE050@a-mtaout20.012.net.il>; Fri, 31 Oct 2014 12:27:25 +0200 (IST) In-reply-to: <20141031102322.GB26371@thyrsus.com> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 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:176078 Archived-At: > Date: Fri, 31 Oct 2014 06:23:22 -0400 > From: "Eric S. Raymond" > Cc: Stefan Monnier , emacs-devel@gnu.org > > > I ended up backporting all of them, but in 3 different commits. A few > > unrelated commits were done in-between Eric's, and since bzr doesn't > > by default allow merging when there are uncommitted changes (and I > > didn't want to use --force to override that), I couldn't easily commit > > all the cherry-picked revisions in one go. But I think 3 is not that > > bad. (The 3rd one is Glenn's revert of one part of Eric's commits.) > > Hm. Which target branch are we talking? emacs-24, of course. > Because I ported those changes to the emacs-24 branch yesterday. I don't see any of that in "bzr log"s output in that branch. Can you tell which revision numbers or revision-IDs you committed to emacs-24 yesterday?