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, 31 Mar 2015 14:47:08 +0300 Message-ID: <83r3s5tmmb.fsf@gnu.org> References: <86egoeusg2.fsf@example.com> <87384qzxqy.fsf@igel.home> <83bnjen71r.fsf@gnu.org> <871tk6538w.fsf@gnu.org> <838ueezgyk.fsf@gnu.org> <878ueejnjz.fsf@uwakimon.sk.tsukuba.ac.jp> <83twx2xoc8.fsf@gnu.org> <87619hke3u.fsf@uwakimon.sk.tsukuba.ac.jp> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1427802470 10639 80.91.229.3 (31 Mar 2015 11:47:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 31 Mar 2015 11:47:50 +0000 (UTC) Cc: rms@gnu.org, sva-news@mygooglest.com, schwab@suse.de, emacs-devel@gnu.org, mikegerwitz@gnu.org, monnier@iro.umontreal.ca To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 31 13:47:32 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 1Ycudo-000051-1R for ged-emacs-devel@m.gmane.org; Tue, 31 Mar 2015 13:47:32 +0200 Original-Received: from localhost ([::1]:38198 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ycudn-0003Ow-Fd for ged-emacs-devel@m.gmane.org; Tue, 31 Mar 2015 07:47:31 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41863) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ycudi-0003Op-7t for emacs-devel@gnu.org; Tue, 31 Mar 2015 07:47:27 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ycudf-0003no-02 for emacs-devel@gnu.org; Tue, 31 Mar 2015 07:47:26 -0400 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:50067) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ycude-0003ml-Op; Tue, 31 Mar 2015 07:47:22 -0400 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0NM200B00R9QKK00@a-mtaout22.012.net.il>; Tue, 31 Mar 2015 14:47:20 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NM200B15REWHY30@a-mtaout22.012.net.il>; Tue, 31 Mar 2015 14:47:20 +0300 (IDT) In-reply-to: <87619hke3u.fsf@uwakimon.sk.tsukuba.ac.jp> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.172 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:184606 Archived-At: > From: "Stephen J. Turnbull" > Cc: rms@gnu.org, > sva-news@mygooglest.com, > schwab@suse.de, > emacs-devel@gnu.org, > mikegerwitz@gnu.org, > monnier@iro.umontreal.ca > Date: Tue, 31 Mar 2015 13:03:33 +0900 > > Eli Zaretskii writes: > > > If it needs to cater to non-experts, let alone people who cannot > > afford or be bothered to learn enough of Git, it should also make sure > > the repository is left in a state from which it is easy to proceed > > with fixing whatever problems are left after backing out the commit. > > I'm not sure this is easy. > > "Easy to proceed with fixing" is an impossible standard, when you're > talking about people who don't follow instructions to the letter and > probably don't remember exactly what they did. Depends on the interpretation of "easy", I guess. I think it should be possible to define that such that this wouldn't be an impossible standard. Basically, the "fixing" part should involve a couple of simple commands. > For example, I have no fscking idea how Richard put his workspace > into a state where git thinks a zillion source files are modified. I think those are just the files brought by "pull", but not merged due to conflicts.