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: Fri, 27 Mar 2015 13:58:54 -0400 Message-ID: References: <20150324163714.GA27775@thyrsus.com> <83y4mmpb1n.fsf@gnu.org> <87lhim9sqp.fsf@igel.home> <87egoc56qg.fsf@gnu.org> <83egoanb8t.fsf@gnu.org> <83sicqa7pk.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1427479179 30321 80.91.229.3 (27 Mar 2015 17:59:39 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 27 Mar 2015 17:59:39 +0000 (UTC) Cc: esr@thyrsus.com, tsdh@gnu.org, schwab@linux-m68k.org, rms@gnu.org, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Mar 27 18:59:25 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 1YbYXR-0007HD-PA for ged-emacs-devel@m.gmane.org; Fri, 27 Mar 2015 18:59:22 +0100 Original-Received: from localhost ([::1]:51217 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbYXQ-0006cF-UM for ged-emacs-devel@m.gmane.org; Fri, 27 Mar 2015 13:59:20 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56112) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbYXD-0006c8-Ey for emacs-devel@gnu.org; Fri, 27 Mar 2015 13:59:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YbYXC-0004rY-9O for emacs-devel@gnu.org; Fri, 27 Mar 2015 13:59:07 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:20518) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbYX8-0004qy-P9; Fri, 27 Mar 2015 13:59:02 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AgUFAGvvdVRBbthL/2dsb2JhbAA3gVOhb4EIgXUBAQQBViMFCws0EhQYDSSIE6IRi3UBJQgHOgwDgz4Dg3AEqDs X-IPAS-Result: AgUFAGvvdVRBbthL/2dsb2JhbAA3gVOhb4EIgXUBAQQBViMFCws0EhQYDSSIE6IRi3UBJQgHOgwDgz4Dg3AEqDs X-IronPort-AV: E=Sophos;i="5.01,1,1400040000"; d="scan'208";a="114762954" Original-Received: from 65-110-216-75.cpe.pppoe.ca (HELO pastel.home) ([65.110.216.75]) by ironport2-out.teksavvy.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 27 Mar 2015 13:58:56 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 68964D65; Fri, 27 Mar 2015 13:58:54 -0400 (EDT) In-Reply-To: <83sicqa7pk.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 27 Mar 2015 16:30:31 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.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:184408 Archived-At: >> > . using the script, the commit+push are not an atomic operation, so >> > the commit could succeed, but the following push could fail, >> > leaving your repository out of sync >> That's true: we need to uncommit if the push fails. >> BTW, we could/should make this case very rare by adding a pre-commit >> hook which makes sure that we're up-to-date before we can commit. > That's not a job for a pre-commit hook, IMO. Why not? That would avoid the kind of state Richard go into, IIUC. That's also what Bzr would do on a bound branch. >> I don't see why Richard (or someone in his situation) would ever need to >> do a local commit. > I think you forget commits after a conflict resolution, e.g. after a > merge from another branch. No I don't (you had already mentioned it in the text I quoted). There's no reason why these commits should be local. > I'm sure there are more situations like that. I don't think we can > assume that absolutely _every_ commit can do a push upstream. Bzr bound branches did just that and it's never been a problem (i.e. --local was only ever needed for offline operation). Stefan