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: Sun, 26 Oct 2014 21:28:27 -0400 Organization: Eric Conspiracy Secret Labs Message-ID: <20141027012827.GA10163@thyrsus.com> References: <20141027000718.F09B5382A66@snark.thyrsus.com> 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 1414373355 6167 80.91.229.3 (27 Oct 2014 01:29:15 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 27 Oct 2014 01:29:15 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Oct 27 02:29:09 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 1XiZ7N-0001H4-EF for ged-emacs-devel@m.gmane.org; Mon, 27 Oct 2014 02:29:09 +0100 Original-Received: from localhost ([::1]:58855 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XiZ7N-0001N9-1n for ged-emacs-devel@m.gmane.org; Sun, 26 Oct 2014 21:29:09 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55630) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XiZ7G-0001Lq-H2 for emacs-devel@gnu.org; Sun, 26 Oct 2014 21:29:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XiZ7C-0007v5-3N for emacs-devel@gnu.org; Sun, 26 Oct 2014 21:29:02 -0400 Original-Received: from static-71-162-243-5.phlapa.fios.verizon.net ([71.162.243.5]:34874 helo=snark.thyrsus.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XiZ7B-0007v1-Vu for emacs-devel@gnu.org; Sun, 26 Oct 2014 21:28:58 -0400 Original-Received: by snark.thyrsus.com (Postfix, from userid 1000) id 2D429383331; Sun, 26 Oct 2014 21:28:27 -0400 (EDT) Content-Disposition: inline In-Reply-To: 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:175882 Archived-At: 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 can't rewrite the upper level myself because I am not familiar with the workflow it was designed to support. To the very limited extent I understand the bzr-merge.el code, I'm not even sure its assumptions make sense anymore - git has a sufficently different model of branches and merging to make that questionable. I would be quite willing to tackle this if I were qualified to do so, but the code will need to be rewritten and rethought by a maintainer much more familiar with past practice and its rationale than I am. -- Eric S. Raymond