From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Steinar Bang Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Sun, 05 Apr 2015 08:43:31 +0200 Organization: Probably a good idea Message-ID: <87zj6n13e4.fsf@dod.no> References: <83twx2xoc8.fsf@gnu.org> <83384jsx3o.fsf@gnu.org> <83pp7nrfdn.fsf@gnu.org> <83a8yqr226.fsf@gnu.org> <831tk2qvz5.fsf@gnu.org> <87384ii26v.fsf@uwakimon.sk.tsukuba.ac.jp> <83wq1tptvp.fsf@gnu.org> <87pp7lhc9h.fsf@uwakimon.sk.tsukuba.ac.jp> <83sichpqe9.fsf@gnu.org> <87ioddglu6.fsf@uwakimon.sk.tsukuba.ac.jp> <83a8yoq56m.fsf@gnu.org> <87384ghm1a.fsf@uwakimon.sk.tsukuba.ac.jp> <837ftspcis.fsf@gnu.org> <551FA115.5090400@gmx.at> <834mowp7cj.fsf@gnu.org> <55200A71.9040902@gmx.at> <867ftr8s7s.fsf@dod.no> <87pp7jfppy.fsf@uwakimon.sk.tsukuba.ac.jp> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1428216242 11960 80.91.229.3 (5 Apr 2015 06:44:02 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 06:44:02 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 05 08:43:53 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 1YeeHg-00055P-8Z for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 08:43:52 +0200 Original-Received: from localhost ([::1]:35367 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeeHf-0006Ei-C7 for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 02:43:51 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40495) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeeHb-0006Ed-Du for emacs-devel@gnu.org; Sun, 05 Apr 2015 02:43:48 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YeeHX-0006Cb-EW for emacs-devel@gnu.org; Sun, 05 Apr 2015 02:43:47 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:47604) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeeHX-0006CX-8A for emacs-devel@gnu.org; Sun, 05 Apr 2015 02:43:43 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1YeeHV-0004ww-84 for emacs-devel@gnu.org; Sun, 05 Apr 2015 08:43:41 +0200 Original-Received: from cm-84.208.248.210.getinternet.no ([84.208.248.210]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 05 Apr 2015 08:43:41 +0200 Original-Received: from sb by cm-84.208.248.210.getinternet.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 05 Apr 2015 08:43:41 +0200 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 22 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: cm-84.208.248.210.getinternet.no Mail-Copies-To: never User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.4 (gnu/linux) Cancel-Lock: sha1:FW3j8acy50RiFIqw3F4lj35jOK8= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:184899 Archived-At: >>>>> "Stephen J. Turnbull" : > Steinar Bang writes: >> > IIUC git's pull is not atomic. When the merge fails with a message like >> > the above I have no idea in what state my copy of a repository is in. >> >> It is in the same state it was as before you did the pull. > No, in the repo origin/master has been updated. You're right. Sorry, I didn't read the statement closely enough. > It's true that master has not been updated and the working tree is > untouched. Yes, that's what I meant. > Of course this difference is probably not apparent to most users. The important thing is that updating origin/master from upstream is an absolutely safe thing to do, wrt. to the local changes (nothing is overwritten, nothing is conflicted, no changes are lost).