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: Bazaar to Git status Date: Sun, 10 Aug 2014 21:17:06 -0400 Organization: Eric Conspiracy Secret Labs Message-ID: <20140811011706.GA22859@thyrsus.com> References: <20140810205631.GA17907@thyrsus.com> Reply-To: esr@thyrsus.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1407719881 30585 80.91.229.3 (11 Aug 2014 01:18:01 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 11 Aug 2014 01:18:01 +0000 (UTC) Cc: emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Aug 11 03:17:56 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 1XGeFB-00042x-4e for ged-emacs-devel@m.gmane.org; Mon, 11 Aug 2014 03:17:49 +0200 Original-Received: from localhost ([::1]:33223 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XGeFA-00047I-Jl for ged-emacs-devel@m.gmane.org; Sun, 10 Aug 2014 21:17:48 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35728) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XGeF3-000470-5U for emacs-devel@gnu.org; Sun, 10 Aug 2014 21:17:45 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XGeEy-0005kh-TN for emacs-devel@gnu.org; Sun, 10 Aug 2014 21:17:41 -0400 Original-Received: from static-71-162-243-5.phlapa.fios.verizon.net ([71.162.243.5]:51691 helo=snark.thyrsus.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XGeEy-0005kd-P2; Sun, 10 Aug 2014 21:17:36 -0400 Original-Received: by snark.thyrsus.com (Postfix, from userid 1000) id 47B98380734; Sun, 10 Aug 2014 21:17:06 -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:173556 Archived-At: Glenn Morris : > "Eric S. Raymond" wrote: >=20 > > You haven't heard much about it because the hard work is all done. I > > have the scripts ready to go and need only about eight hours' notice > > before pushing the button. >=20 > I'm pretty sure there was a list of other things that needed to be done= , > beside "replace old revision references". I hope someone was keeping a > list of the various items that were requested, so that we don't have to > go through it all over again. >=20 > Eg what will replace bzr --fixes, bzrmerge.el, vc-git.el improvements, > etc, etc. I've been maintaining that list. It's the file transition.txt in the=20 conversion-machinery repo. To the best of my knowledge, the only major un-done task for before the=20 conversion is this one: * Better cross-VCS integration of smerge in vc.el. Here are Stefan's requirements: - Improve vc-git.el so that it can automatically enable smerge-mode when opening a conflicted file and (probably conditional on a config var) mark the file as "not conflicted any more" when saving with no remaining diff3 markers. This currently works in vc-bzr.el (and vc-svn.el as well, IIRC). - Improve vc-git.el with vc-git-conflicted-files so that vc-find-conflicted-files works for Git as well. See R=FCdiger Sonderfeld's patch proposal: https://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01038.html What really needs to happen here, I think, is for the smerge support=20 to be moved into the core vc code rather than being a set of disjoint per-VC kluges. I reckon this to be about a day and a half of work. I'll schedule=20 it when we start seriously discussing a cutover date. --=20 Eric S. Raymond