From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Stephen J. Turnbull" Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Sun, 05 Apr 2015 17:44:49 +0900 Message-ID: <87lhi7ezge.fsf@uwakimon.sk.tsukuba.ac.jp> References: <83twx2xoc8.fsf@gnu.org> <87619hke3u.fsf@uwakimon.sk.tsukuba.ac.jp> <551A3F17.6020903@math.ntnu.no> <20150331085055.GA2871@acm.fritz.box> <87zj6tiko1.fsf@uwakimon.sk.tsukuba.ac.jp> <20150331104935.GB2871@acm.fritz.box> <87y4mdi7tj.fsf@uwakimon.sk.tsukuba.ac.jp> <20150331214347.GH2871@acm.fritz.box> <20150401103225.GA2633@acm.fritz.box> <87h9t080gx.fsf@javad.com> <83384jsx3o.fsf@gnu.org> <83pp7nrfdn.fsf@gnu.org> <83a8yqr226.fsf@gnu.org> <831tk2qvz5.fsf@gnu.org> <87384ii26v.fsf@uwakimon.sk.tsukuba.ac.jp> <83wq1tptvp.fsf@gnu.org> <87pp7lhc9h.fsf@uwakimon.sk.tsukuba.ac.jp> <83sichpqe9.fsf@gnu.org> <87ioddglu6.fsf@uwakimon.sk.tsukuba.ac.jp> <83a8yoq56m.fsf@gnu.org> <87384ghm1a.fsf@uwakimon.sk.tsukuba.ac.jp> <837ftspcis.fsf@gnu.org> <551FA115.5090400@gmx.at> <834mowp7cj.fsf@gnu.org> <55200A71.9040902@gmx.at> <83oan3onki.fsf@gnu.org> <87sicffqma.fsf@uwakimon.sk.tsukuba.ac.jp> <834movnjm0.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 X-Trace: ger.gmane.org 1428223511 15120 80.91.229.3 (5 Apr 2015 08:45:11 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 08:45:11 +0000 (UTC) Cc: rudalics@gmx.at, sorganov@gmail.com, Richard Stallman , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 05 10:45:03 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 1YegAw-0003F7-Tx for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 10:45:03 +0200 Original-Received: from localhost ([::1]:35551 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YegAw-0000VF-5k for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 04:45:02 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56511) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YegAs-0000Uu-8Y for emacs-devel@gnu.org; Sun, 05 Apr 2015 04:44:59 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YegAr-0001PD-GT for emacs-devel@gnu.org; Sun, 05 Apr 2015 04:44:58 -0400 Original-Received: from shako.sk.tsukuba.ac.jp ([130.158.97.161]:53463) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YegAk-0001MA-Oa; Sun, 05 Apr 2015 04:44:50 -0400 Original-Received: from uwakimon.sk.tsukuba.ac.jp (uwakimon.sk.tsukuba.ac.jp [130.158.99.156]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by shako.sk.tsukuba.ac.jp (Postfix) with ESMTPS id 4BD0F1C386A; Sun, 5 Apr 2015 17:44:49 +0900 (JST) Original-Received: by uwakimon.sk.tsukuba.ac.jp (Postfix, from userid 1000) id 27A2F120EC9; Sun, 5 Apr 2015 17:44:49 +0900 (JST) In-Reply-To: <834movnjm0.fsf@gnu.org> X-Mailer: VM undefined under 21.5 (beta34) "kale" 83e5c3cd6be6 XEmacs Lucid (x86_64-unknown-linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 130.158.97.161 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:184904 Archived-At: Eli Zaretskii writes: > > If the uncommitted files were inadvertant (typical beginner > > mistake), your advice to commit, pull again, and fix the conflicts > > is appropriate. But this doesn't work for Richard, who deliberately > > leaves some changes uncommitted. > > Why doesn't it work? Because changes he didn't want to commit just > yet will end up committed? I think this is a small price to pay for > avoiding to learn about stashing, and for having what is mostly the > same workflow he and others had with CVS. Richard will speak for himself about the size of the price, but I suspect he doesn't need to pay it at all in the current case (see my other post, specifically about "git commit --include" -- and now you have a hint as to why manipulating the "index" is useful[1]). He will need to do something else in the case that he runs into the "will overwrite your changes" message. However, since he seems comfortable with the "don't touch ChangeLogs until after you pull" workflow, I'm guessing the probability that he'll run into something really ugly is unlikely. True, this time he actually committed "offline" twice because of missing pushes which could cause issues (maybe those commits are the missing logs?), but if he finds a good way to automate those, he should be in pretty good shape. Footnotes: [1] Unfortunately it still doesn't help with the "atomic check-in" issue but perhaps that can be solved to Richard's satisfaction with the proposed post-commit hook.