From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Tue, 24 Mar 2015 22:18:52 +0200 Message-ID: <83mw32p2s3.fsf@gnu.org> References: <86egoeusg2.fsf@example.com> <83pp7yp5po.fsf@gnu.org> <20150324195638.GA2521@thyrsus.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1427228765 28019 80.91.229.3 (24 Mar 2015 20:26:05 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 24 Mar 2015 20:26:05 +0000 (UTC) Cc: sva-news@mygooglest.com, emacs-devel@gnu.org To: esr@thyrsus.com Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 24 21:25:57 2015 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 1YaVNk-0000fV-LL for ged-emacs-devel@m.gmane.org; Tue, 24 Mar 2015 21:25:00 +0100 Original-Received: from localhost ([::1]:34385 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YaVNj-0008Ri-Un for ged-emacs-devel@m.gmane.org; Tue, 24 Mar 2015 16:24:59 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55394) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YaVIE-0007ya-7R for emacs-devel@gnu.org; Tue, 24 Mar 2015 16:19:19 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YaVIA-0003iV-Jf for emacs-devel@gnu.org; Tue, 24 Mar 2015 16:19:18 -0400 Original-Received: from mtaout27.012.net.il ([80.179.55.183]:56470) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YaVIA-0003hw-Aj for emacs-devel@gnu.org; Tue, 24 Mar 2015 16:19:14 -0400 Original-Received: from conversion-daemon.mtaout27.012.net.il by mtaout27.012.net.il (HyperSendmail v2007.08) id <0NLQ00A00G5VUM00@mtaout27.012.net.il> for emacs-devel@gnu.org; Tue, 24 Mar 2015 22:13:47 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout27.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NLQ001H7G6Z0W90@mtaout27.012.net.il>; Tue, 24 Mar 2015 22:13:47 +0200 (IST) In-reply-to: <20150324195638.GA2521@thyrsus.com> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.183 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:184180 Archived-At: > Date: Tue, 24 Mar 2015 15:56:38 -0400 > From: "Eric S. Raymond" > Cc: Sebastien Vauban , emacs-devel@gnu.org > > Eli Zaretskii : > > A related question is: does "C-x v v" at all make sense with Git and > > other dVCSes? If it does, what would be the DWIM cycle there? E.g., > > would it make sense for "C-x v v" to push when the previous action was > > commit and there are not uncommitted changes? > > That's an interesting idea. And certainly doable. > > Whether it's really DWIM depends on what workflow git's primitives are being > used to implement. It makes the most sense if the relationship between the > local and remote repo is the simplest one - the local repo is essentially > a cache for the remote, and nobody else pushes to that remote. > > It makes less sense if other people are pushing to the remote. You wander > into several complications here; one is that the remote may reject the push > due to it not being a fast-forward from the repo tip. There are > workflow-sensitive choices about what to do in this situation and thus no > one right thing for VC to do here. So perhaps there should be a defcustom that would switch between several popular workflows, and "C-x v v" could then support each one of them, when chosen.