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 16:52:34 +0200 Message-ID: References: <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> <20150331085055.GA2871@acm.fritz.box> <87zj6tiko1.fsf@uwakimon.sk.tsukuba.ac.jp> <20150331104935.GB2871@acm.fritz.box> <86ego5qoj1.fsf@example.com> <838uedtg47.fsf@gnu.org> <551AAEA1.30108@yandex.ru> <834mp1tf0j.fsf@gnu.org> <83384lte8y.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1427813598 10679 80.91.229.3 (31 Mar 2015 14:53:18 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 31 Mar 2015 14:53:18 +0000 (UTC) Cc: sva-news@mygooglest.com, dgutov@yandex.ru, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 31 16:53:10 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 1YcxXG-0001Gq-V7 for ged-emacs-devel@m.gmane.org; Tue, 31 Mar 2015 16:52:59 +0200 Original-Received: from localhost ([::1]:39097 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcxXG-0005GN-9P for ged-emacs-devel@m.gmane.org; Tue, 31 Mar 2015 10:52:58 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59598) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcxWz-0005GF-6N for emacs-devel@gnu.org; Tue, 31 Mar 2015 10:52:45 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YcxWy-0003Wi-6p for emacs-devel@gnu.org; Tue, 31 Mar 2015 10:52:41 -0400 Original-Received: from cantor2.suse.de ([195.135.220.15]:44016 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcxWu-0003Ug-9i; Tue, 31 Mar 2015 10:52:36 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Original-Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 55AB0AD8A; Tue, 31 Mar 2015 14:52:35 +0000 (UTC) X-Yow: Darling, my ELBOW is FLYING over FRANKFURT, Germany.. In-Reply-To: <83384lte8y.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 31 Mar 2015 17:47:57 +0300") 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:184644 Archived-At: Eli Zaretskii writes: >> From: Andreas Schwab >> Date: Tue, 31 Mar 2015 16:39:24 +0200 >> Cc: sva-news@mygooglest.com, emacs-devel@gnu.org, >> Dmitry Gutov >> >> Eli Zaretskii writes: >> >> >> Date: Tue, 31 Mar 2015 17:26:41 +0300 >> >> From: Dmitry Gutov >> >> CC: emacs-devel@gnu.org >> >> >> >> On 03/31/2015 05:07 PM, Eli Zaretskii wrote: >> >> > Nothing, IME. Contrary to the cited text, "git pull" with uncommitted >> >> > changes doesn't fail. I do this every time before committing a >> >> > changeset I intend to push, and it always worked for me. >> >> >> >> Neither is exactly true. Since 1.7.0 or so, "git pull" with uncommitted >> >> changes can succeed if the newly pulled changes don't touch the locally >> >> changed files, but will fail otherwise. Which makes a lot of sense. >> > >> > Yes, and is expected. Even CVS did that ;-) >> >> No, CVS overwrites your changed files unconditionally. > > And makes a merge conflict, AFAIR. Unconditionally. 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."