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: VC mode and git Date: Mon, 30 Mar 2015 13:24:04 -0400 Message-ID: References: <86egoeusg2.fsf@example.com> <87384qzxqy.fsf@igel.home> <83bnjen71r.fsf@gnu.org> <871tk6538w.fsf@gnu.org> <838ueezgyk.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1427736334 18791 80.91.229.3 (30 Mar 2015 17:25:34 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 30 Mar 2015 17:25:34 +0000 (UTC) Cc: sva-news@mygooglest.com, Mike Gerwitz , emacs-devel@gnu.org, rms@gnu.org, schwab@suse.de To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Mar 30 19:25:24 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 1YcdQo-0007DG-Dx for ged-emacs-devel@m.gmane.org; Mon, 30 Mar 2015 19:24:58 +0200 Original-Received: from localhost ([::1]:35332 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcdQn-0000Lf-QE for ged-emacs-devel@m.gmane.org; Mon, 30 Mar 2015 13:24:57 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52781) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcdQY-0000Jz-Nb for emacs-devel@gnu.org; Mon, 30 Mar 2015 13:24:43 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YcdQX-0002CN-Sy for emacs-devel@gnu.org; Mon, 30 Mar 2015 13:24:42 -0400 Original-Received: from mercure.iro.umontreal.ca ([132.204.24.67]:50753) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcdQS-0001zb-Ci; Mon, 30 Mar 2015 13:24:36 -0400 Original-Received: from hidalgo.iro.umontreal.ca (hidalgo.iro.umontreal.ca [132.204.27.50]) by mercure.iro.umontreal.ca (Postfix) with ESMTP id 594D085CA1; Mon, 30 Mar 2015 13:24:32 -0400 (EDT) Original-Received: from lechon.iro.umontreal.ca (lechon.iro.umontreal.ca [132.204.27.242]) by hidalgo.iro.umontreal.ca (Postfix) with ESMTP id B10361E5B8B; Mon, 30 Mar 2015 13:24:04 -0400 (EDT) Original-Received: by lechon.iro.umontreal.ca (Postfix, from userid 20848) id 8B227B40DB; Mon, 30 Mar 2015 13:24:04 -0400 (EDT) In-Reply-To: <838ueezgyk.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 30 Mar 2015 17:40:35 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-DIRO-MailScanner-Information: Please contact the ISP for more information X-DIRO-MailScanner: Found to be clean X-DIRO-MailScanner-SpamCheck: n'est pas un polluriel, SpamAssassin (score=-2.82, requis 5, autolearn=not spam, ALL_TRUSTED -2.82, MC_TSTLAST 0.00) X-DIRO-MailScanner-From: monnier@iro.umontreal.ca X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 132.204.24.67 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:184557 Archived-At: >> But what if rebasing fails? Then you are left resolving a conflict >> before you can attempt the push operation again. I do not know how you >> would want to handle this. The way we'd normally handle this (e.g. the way Bazaar handled it, and the way CVS handled it) is to abort the commit operation. Then the user can do the "pull" any which way he wants, and try to commit again. Doing "git pull --rebase" and trying to handle conflicts directly from the commit hook is madness, IMNSHO. > In any case, I think it is clear now that post-commit hooks cannot be > the solution, To me, it's clear that such hooks can definitely, cleanly, reliably provide the expected "cvs commit"-like semantics. Stefan