From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Harald Hanche-Olsen Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Tue, 31 Mar 2015 08:30:47 +0200 Message-ID: <551A3F17.6020903@math.ntnu.no> 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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1427783505 30491 80.91.229.3 (31 Mar 2015 06:31:45 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 31 Mar 2015 06:31:45 +0000 (UTC) Cc: rms@gnu.org, emacs-devel@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 31 08:31:36 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 1Ycpi0-0002X1-7I for ged-emacs-devel@m.gmane.org; Tue, 31 Mar 2015 08:31:32 +0200 Original-Received: from localhost ([::1]:37149 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ycphz-0001di-II for ged-emacs-devel@m.gmane.org; Tue, 31 Mar 2015 02:31:31 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55494) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ycphn-0001da-7v for emacs-devel@gnu.org; Tue, 31 Mar 2015 02:31:20 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ycphh-0000Ev-8Y for emacs-devel@gnu.org; Tue, 31 Mar 2015 02:31:19 -0400 Original-Received: from hylle06.itea.ntnu.no ([129.241.56.235]:41056) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ycphh-0000DR-2M; Tue, 31 Mar 2015 02:31:13 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by hylle06.itea.ntnu.no (Postfix) with ESMTP id A26B9660DE8; Tue, 31 Mar 2015 08:31:04 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hylle06.itea.ntnu.no Original-Received: from [192.168.1.103] (235-32-8.connect.netcom.no [89.8.32.235]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: hanche) by hylle06.itea.ntnu.no (Postfix) with ESMTPSA id 05B19660CDD; Tue, 31 Mar 2015 08:31:03 +0200 (CEST) User-Agent: Postbox 3.0.11 (Macintosh/20140602) In-Reply-To: <87619hke3u.fsf@uwakimon.sk.tsukuba.ac.jp> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 129.241.56.235 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:184587 Archived-At: Stephen J. Turnbull wrote: > "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. For example, I have no > fscking idea how Richard put his workspace into a state where git > thinks a zillion source files are modified. That one is easy: He did a pull. His local repo had been modified, since=20 he had been doing some work there. And then the pull failed due to a=20 merge conflict in lisp/ChangeLog. As a result, all the files resulting=20 from the successful part of the merge are in the index, and hence marked=20 as modified. There are a lot of them because a lot had been happening in=20 the central repo while Richard was hacking on his own. I am quite confident that all the changes he made are safely stored in=20 the dca743f0941909a80e3f28c023977120b6203e20 commit in his local repo.=20 The *only* possible data loss is in lisp/ChangeLog, since that was (I=20 believe) in an edited, uncommitted state when he did the pull. =E2=80=93 Harald