From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Move to git is imminent - awaiting Stefan's approval Date: Mon, 06 Jan 2014 16:09:36 -0500 Message-ID: References: <20140106165108.B6BF4380865@snark.thyrsus.com> <83zjn9rpaz.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1389042600 12105 80.91.229.3 (6 Jan 2014 21:10:00 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 6 Jan 2014 21:10:00 +0000 (UTC) Cc: "Eric S. Raymond" , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 06 22:10:05 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 1W0HQx-0001h8-D3 for ged-emacs-devel@m.gmane.org; Mon, 06 Jan 2014 22:10:03 +0100 Original-Received: from localhost ([::1]:37577 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0HQw-0003dm-Un for ged-emacs-devel@m.gmane.org; Mon, 06 Jan 2014 16:10:02 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41826) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0HQn-0003cN-Jm for emacs-devel@gnu.org; Mon, 06 Jan 2014 16:10:00 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W0HQg-0001rt-9f for emacs-devel@gnu.org; Mon, 06 Jan 2014 16:09:53 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:1848) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0HQY-0001qu-FN; Mon, 06 Jan 2014 16:09:38 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av4EABK/CFFFxKG9/2dsb2JhbABEvw4Xc4IeAQEEAVYjBQsLNBIUGA0kiB4GwS2RCgOIYZwZgV6DFQ X-IPAS-Result: Av4EABK/CFFFxKG9/2dsb2JhbABEvw4Xc4IeAQEEAVYjBQsLNBIUGA0kiB4GwS2RCgOIYZwZgV6DFQ X-IronPort-AV: E=Sophos;i="4.84,565,1355115600"; d="scan'208";a="44276584" Original-Received: from 69-196-161-189.dsl.teksavvy.com (HELO pastel.home) ([69.196.161.189]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 06 Jan 2014 16:09:37 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id 2597E62F04; Mon, 6 Jan 2014 16:09:37 -0500 (EST) In-Reply-To: <83zjn9rpaz.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 06 Jan 2014 19:30:12 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.181 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:167527 Archived-At: > The above is not enough. I would suggest to have the following > additional steps, before the switch: Sounds right. I'd also like: - 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. - Release 24.4 (i.e. I'd rather not deal with the move before we release 24.4). - The $5M mentioned by Eli sounds good as well. Tho somehow I have the impression this isn't gonna happen. > - He's not bringing any new argument that has not been discussed > before; the only difference is that Richard and Stefan seem to accept > now that Bazaar is beyond hope. Side note: I've considered Bzr dead for a while now (hence the move to Git for `elpa'). FWIW, my vote is on "have better things to do with my time than worry about which VCS we use". IOW the main change so far is that Richard does not insist on us using Bzr any more. Stefan