From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Lele Gaifax Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Sun, 05 Apr 2015 10:27:46 +0200 Organization: Nautilus Entertainments Message-ID: <87384frnct.fsf@nautilus.nautilus> References: <83twx2xoc8.fsf@gnu.org> <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> <551FA7F6.8060103@math.ntnu.no> <87wq1rfvvp.fsf@uwakimon.sk.tsukuba.ac.jp> <87619bbmgj.fsf@nautilus.nautilus> <87r3rzfpvh.fsf@uwakimon.sk.tsukuba.ac.jp> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1428222493 32464 80.91.229.3 (5 Apr 2015 08:28:13 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 08:28:13 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 05 10:28:05 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 1YefuW-00005r-3W for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 10:28:04 +0200 Original-Received: from localhost ([::1]:35531 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YefuV-0006XM-AR for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 04:28:03 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54434) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YefuR-0006X6-79 for emacs-devel@gnu.org; Sun, 05 Apr 2015 04:28:00 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YefuO-00040N-0X for emacs-devel@gnu.org; Sun, 05 Apr 2015 04:27:59 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:50480) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YefuN-0003zx-QC for emacs-devel@gnu.org; Sun, 05 Apr 2015 04:27:55 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1YefuM-0008QS-IZ for emacs-devel@gnu.org; Sun, 05 Apr 2015 10:27:54 +0200 Original-Received: from 151.62.96.249 ([151.62.96.249]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 05 Apr 2015 10:27:54 +0200 Original-Received: from lele by 151.62.96.249 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 05 Apr 2015 10:27:54 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 34 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 151.62.96.249 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) Cancel-Lock: sha1:3i4Y3+6B15ZfMfQ5erlBScJcfHc= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:184902 Archived-At: "Stephen J. Turnbull" writes: > Lele Gaifax writes: > > > AFAICT, the following simple script replicates a similar case, with > > the same outcome: > > That script does the pull with no uncommitted changes, but my > understanding was that Richard likes to leave changes uncommitted, and > that was the case here. I disagree with that understanding, for two reasons: a) Richard started this thread[*] being surprised that under git a "commit" is a different thing than a "push", when realized he changed some entries in an old version of some ChangeLog; as Richard also stated that he usually touches the ChangeLog only when he is satisfied by the changes, I assume that he committed those as well (it does not make any difference if using a single commit with the changelog notes, or in different commits) b) the "git status -s" he sent shows that his ChangeLog file was "modified on both sides", and that can happen only when there were commits on both sides that touched the file in question Both reasons match with the scenario I scripted. Happy Easter, ciao, lele. [*] Really "git is screwed", started a couple of days before this one -- nickname: Lele Gaifax | Quando vivrò di quello che ho pensato ieri real: Emanuele Gaifas | comincerò ad aver paura di chi mi copia. lele@metapensiero.it | -- Fortunato Depero, 1929.