From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Alan Mackenzie Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Tue, 31 Mar 2015 08:50:55 +0000 Message-ID: <20150331085055.GA2871@acm.fritz.box> References: <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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1427791894 31876 80.91.229.3 (31 Mar 2015 08:51:34 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 31 Mar 2015 08:51:34 +0000 (UTC) Cc: "Stephen J. Turnbull" , Harald Hanche-Olsen , rms@gnu.org, emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 31 10:51:26 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 1YcrtH-0004YY-KD for ged-emacs-devel@m.gmane.org; Tue, 31 Mar 2015 10:51:19 +0200 Original-Received: from localhost ([::1]:37581 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcrtG-0000KP-Qf for ged-emacs-devel@m.gmane.org; Tue, 31 Mar 2015 04:51:18 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57315) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcrtD-0000IF-6r for emacs-devel@gnu.org; Tue, 31 Mar 2015 04:51:16 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ycrt8-0000nh-4z for emacs-devel@gnu.org; Tue, 31 Mar 2015 04:51:15 -0400 Original-Received: from colin.muc.de ([193.149.48.1]:52500 helo=mail.muc.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ycrt7-0000na-RX for emacs-devel@gnu.org; Tue, 31 Mar 2015 04:51:10 -0400 Original-Received: (qmail 39465 invoked by uid 3782); 31 Mar 2015 08:51:07 -0000 Original-Received: from acm.muc.de (pD9519B17.dip0.t-ipconnect.de [217.81.155.23]) by colin.muc.de (tmda-ofmipd) with ESMTP; Tue, 31 Mar 2015 10:51:06 +0200 Original-Received: (qmail 2906 invoked by uid 1000); 31 Mar 2015 08:50:55 -0000 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) X-Delivery-Agent: TMDA/1.1.12 (Macallan) X-Primary-Address: acm@muc.de X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x X-Received-From: 193.149.48.1 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:184595 Archived-At: Hello, Andreas. On Tue, Mar 31, 2015 at 09:35:07AM +0200, 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. That is the case in the current git version. I think that in previous versions, git took the liberty of simply overwriting changed files in the workspace. At least, I think that's what happened to me a couple of times around the beginning of the year. Why can't git simply merge changes properly into the workspace, thus saving users the unwelcome hassle of, e.g., git stash followed by git merge followed by git stash pop? > Andreas. > -- > Andreas Schwab, SUSE Labs, schwab@suse.de > GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 > "And now for something completely different." -- Alan Mackenzie (Nuremberg, Germany).