From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Tue, 31 Mar 2015 10:36:29 +0200 Message-ID: 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> <551A3F17.6020903@math.ntnu.no> <551A59F1.3060602@math.ntnu.no> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1427791025 17865 80.91.229.3 (31 Mar 2015 08:37:05 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 31 Mar 2015 08:37:05 +0000 (UTC) Cc: "Stephen J. Turnbull" , rms@gnu.org, emacs-devel@gnu.org To: Harald Hanche-Olsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 31 10:36:49 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 1Ycrf9-0001cB-3F for ged-emacs-devel@m.gmane.org; Tue, 31 Mar 2015 10:36:43 +0200 Original-Received: from localhost ([::1]:37528 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ycrf7-0003PD-2c for ged-emacs-devel@m.gmane.org; Tue, 31 Mar 2015 04:36:41 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54713) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ycrf1-0003Ks-0K for emacs-devel@gnu.org; Tue, 31 Mar 2015 04:36:35 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ycrex-0004vd-Jv for emacs-devel@gnu.org; Tue, 31 Mar 2015 04:36:34 -0400 Original-Received: from cantor2.suse.de ([195.135.220.15]:47683 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ycrex-0004vO-5a; Tue, 31 Mar 2015 04:36:31 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Original-Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 20599AB07; Tue, 31 Mar 2015 08:36:30 +0000 (UTC) X-Yow: I don't believe there really IS a GAS SHORTAGE.. I think it's all just a BIG HOAX on the part of the plastic sign salesmen-- .. to sell more numbers!! In-Reply-To: <551A59F1.3060602@math.ntnu.no> (Harald Hanche-Olsen's message of "Tue, 31 Mar 2015 10:25:21 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] X-Received-From: 195.135.220.15 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:184593 Archived-At: Harald Hanche-Olsen writes: > Andreas Schwab wrote: >> Harald Hanche-Olsen writes: >> >>> The *only* possible data loss is in lisp/ChangeLog, since that was (I >>> believe) in an edited, uncommitted state when he did the pull. >> >> git would have refused to start the merge if that were the case. > > If you say so. But then why do we see this warning from =E2=80=9Cgit he= lp merge=E2=80=9D? That is about files that are not modified by the merge. Andreas. --=20 Andreas Schwab, SUSE Labs, schwab@suse.de GPG Key fingerprint =3D 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D= 7 "And now for something completely different."