From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Tue, 31 Mar 2015 18:02:25 +0300 Message-ID: <831tk5tdku.fsf@gnu.org> 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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1427814205 21034 80.91.229.3 (31 Mar 2015 15:03:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 31 Mar 2015 15:03:25 +0000 (UTC) Cc: sva-news@mygooglest.com, dgutov@yandex.ru, emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 31 17:03:21 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 1Ycxh6-0000ud-85 for ged-emacs-devel@m.gmane.org; Tue, 31 Mar 2015 17:03:08 +0200 Original-Received: from localhost ([::1]:39117 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ycxh0-0008Hk-8Q for ged-emacs-devel@m.gmane.org; Tue, 31 Mar 2015 11:03:02 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33454) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ycxgi-0008He-TW for emacs-devel@gnu.org; Tue, 31 Mar 2015 11:02:48 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ycxgd-0006sV-84 for emacs-devel@gnu.org; Tue, 31 Mar 2015 11:02:44 -0400 Original-Received: from mtaout21.012.net.il ([80.179.55.169]:32811) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ycxgc-0006sL-WD for emacs-devel@gnu.org; Tue, 31 Mar 2015 11:02:39 -0400 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0NM300H0000YQ400@a-mtaout21.012.net.il> for emacs-devel@gnu.org; Tue, 31 Mar 2015 18:02:37 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NM300H4Q0GCOT40@a-mtaout21.012.net.il>; Tue, 31 Mar 2015 18:02:37 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.169 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:184646 Archived-At: > From: Andreas Schwab > Cc: sva-news@mygooglest.com, emacs-devel@gnu.org, dgutov@yandex.ru > Date: Tue, 31 Mar 2015 16:52:34 +0200 > > 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. Right.