From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Eric S. Raymond" Newsgroups: gmane.emacs.devel Subject: Re: git transition issues Date: Fri, 31 Oct 2014 06:51:42 -0400 Organization: Eric Conspiracy Secret Labs Message-ID: <20141031105142.GA27981@thyrsus.com> References: <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> <83fve4zg8m.fsf@gnu.org> Reply-To: esr@thyrsus.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1414775361 15621 80.91.229.3 (31 Oct 2014 17:09:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 31 Oct 2014 17:09:21 +0000 (UTC) Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Oct 31 18:09:16 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 1XkFhK-0005Xf-TD for ged-emacs-devel@m.gmane.org; Fri, 31 Oct 2014 18:09:15 +0100 Original-Received: from localhost ([::1]:39536 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XkFhK-0006Fy-CF for ged-emacs-devel@m.gmane.org; Fri, 31 Oct 2014 13:09:14 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37649) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XkDly-00059A-5j for emacs-devel@gnu.org; Fri, 31 Oct 2014 11:06:12 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xk9o3-0005a0-IB for emacs-devel@gnu.org; Fri, 31 Oct 2014 06:51:51 -0400 Original-Received: from static-71-162-243-5.phlapa.fios.verizon.net ([71.162.243.5]:46478 helo=snark.thyrsus.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xk9nz-0005YI-6w; Fri, 31 Oct 2014 06:51:43 -0400 Original-Received: by snark.thyrsus.com (Postfix, from userid 1000) id 9C11F3835AE; Fri, 31 Oct 2014 06:51:42 -0400 (EDT) Content-Disposition: inline In-Reply-To: <83fve4zg8m.fsf@gnu.org> X-Eric-Conspiracy: There is no conspiracy User-Agent: Mutt/1.5.21 (2010-09-15) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 71.162.243.5 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:176094 Archived-At: Eli Zaretskii : > > 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? Checking...117637 in my log. ------------------------------------------------------------ revno: 117637 committer: Eric S. Raymond branch nick: emacs-24 timestamp: Thu 2014-10-30 15:21:32 -0400 message: Port preparatory patches for the git transition from trunk. These contain no git-specific language or code; rather, they change language that was bzr-specific to be independent of the VCS type. -- Eric S. Raymond