From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Stephen J. Turnbull" Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Sun, 05 Apr 2015 08:17:29 +0900 Message-ID: <87pp7jfppy.fsf@uwakimon.sk.tsukuba.ac.jp> References: <83twx2xoc8.fsf@gnu.org> <20150401103225.GA2633@acm.fritz.box> <87h9t080gx.fsf@javad.com> <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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 X-Trace: ger.gmane.org 1428189466 6723 80.91.229.3 (4 Apr 2015 23:17:46 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 4 Apr 2015 23:17:46 +0000 (UTC) Cc: emacs-devel@gnu.org To: Steinar Bang Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 05 01:17:41 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 1YeXJs-0007sl-E1 for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 01:17:40 +0200 Original-Received: from localhost ([::1]:34603 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeXJr-00069b-Nm for ged-emacs-devel@m.gmane.org; Sat, 04 Apr 2015 19:17:39 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44076) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeXJn-00069O-Il for emacs-devel@gnu.org; Sat, 04 Apr 2015 19:17:36 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YeXJi-0003hf-IV for emacs-devel@gnu.org; Sat, 04 Apr 2015 19:17:35 -0400 Original-Received: from shako.sk.tsukuba.ac.jp ([130.158.97.161]:46002) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeXJi-0003gf-9B for emacs-devel@gnu.org; Sat, 04 Apr 2015 19:17:30 -0400 Original-Received: from uwakimon.sk.tsukuba.ac.jp (uwakimon.sk.tsukuba.ac.jp [130.158.99.156]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by shako.sk.tsukuba.ac.jp (Postfix) with ESMTPS id 8349F1C3938; Sun, 5 Apr 2015 08:17:29 +0900 (JST) Original-Received: by uwakimon.sk.tsukuba.ac.jp (Postfix, from userid 1000) id 5D769120EC9; Sun, 5 Apr 2015 08:17:29 +0900 (JST) In-Reply-To: <867ftr8s7s.fsf@dod.no> X-Mailer: VM undefined under 21.5 (beta34) "kale" 83e5c3cd6be6 XEmacs Lucid (x86_64-unknown-linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 130.158.97.161 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:184895 Archived-At: 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. It's true that master has not been updated and the working tree is untouched. Of course this difference is probably not apparent to most users.