From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.devel Subject: Re: git transition issues Date: Tue, 28 Oct 2014 11:35:12 -0400 Message-ID: References: <20141027000718.F09B5382A66@snark.thyrsus.com> <20141027012827.GA10163@thyrsus.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1414510555 3644 80.91.229.3 (28 Oct 2014 15:35:55 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 28 Oct 2014 15:35:55 +0000 (UTC) Cc: Stefan Monnier , emacs-devel@gnu.org To: esr@thyrsus.com Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Oct 28 16:35:50 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 1Xj8oH-0001rm-MV for ged-emacs-devel@m.gmane.org; Tue, 28 Oct 2014 16:35:49 +0100 Original-Received: from localhost ([::1]:39865 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xj8oH-0003TU-7J for ged-emacs-devel@m.gmane.org; Tue, 28 Oct 2014 11:35:49 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46425) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xj8no-0003TP-JI for emacs-devel@gnu.org; Tue, 28 Oct 2014 11:35:21 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xj8ni-0002EY-NK for emacs-devel@gnu.org; Tue, 28 Oct 2014 11:35:20 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:47996) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xj8ni-0002EU-Jg for emacs-devel@gnu.org; Tue, 28 Oct 2014 11:35:14 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1Xj8nh-0002De-JH; Tue, 28 Oct 2014 11:35:13 -0400 X-Spook: UFO interception csim AIEWS Montenegro cryptographic PET X-Ran: b[oJ8WIg\diam="ox (Eric S. Raymond's message of "Sun, 26 Oct 2014 21:28:27 -0400") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::e 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:175925 Archived-At: "Eric S. Raymond" wrote: > Stefan Monnier : > >> Yes, [bzrmerge.el] needs to be rewritten. I thought it was done >> already. It was mentioned as one of the prerequisites for a move to >> Git, since we use it on a regular basis to merge the new emacs-24 >> changes into trunk. > > The prerequisite I understood - and satisfied, I believe - was to add > the vc-git.el support (equivalent to certain methods in the bzr back > end) required to rewrite this code. I mentioned bzrmerge.el needing to be replaced more than once, eg http://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00302.html