From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Harald Hanche-Olsen Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Sun, 05 Apr 2015 22:18:49 +0200 Message-ID: <552198A9.8060009@math.ntnu.no> References: <5511998E.8080309@cs.ucla.edu> <5512F8C7.7010509@math.ntnu.no> <5513F889.4000404@math.ntnu.no> <552102D6.1030106@math.ntnu.no> <552194A9.20005@math.ntnu.no> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1428265142 5785 80.91.229.3 (5 Apr 2015 20:19:02 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 20:19:02 +0000 (UTC) Cc: eggert@cs.ucla.edu, emacs-devel@gnu.org To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 05 22:19:00 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 1Yer0V-00069H-8T for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 22:18:59 +0200 Original-Received: from localhost ([::1]:37531 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yer0U-0004HL-LD for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 16:18:58 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58109) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yer0Q-0004GC-Qi for emacs-devel@gnu.org; Sun, 05 Apr 2015 16:18:55 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yer0P-0001Cu-Sm for emacs-devel@gnu.org; Sun, 05 Apr 2015 16:18:54 -0400 Original-Received: from hylle05.itea.ntnu.no ([2001:700:300:3::225]:45130) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yer0P-0001CJ-Lo; Sun, 05 Apr 2015 16:18:53 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by hylle05.itea.ntnu.no (Postfix) with ESMTP id ED5AE90D44D; Sun, 5 Apr 2015 22:18:51 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hylle05.itea.ntnu.no Original-Received: from [IPv6:2001:4662:4ffb::9c03:cb99:4344:82bc] (unknown [IPv6:2001:4662:4ffb:0:9c03:cb99:4344:82bc]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: hanche) by hylle05.itea.ntnu.no (Postfix) with ESMTPSA id CD41990D3E0; Sun, 5 Apr 2015 22:18:50 +0200 (CEST) User-Agent: Postbox 3.0.11 (Macintosh/20140602) In-Reply-To: <552194A9.20005@math.ntnu.no> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:700:300:3::225 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:184980 Archived-At: Harald Hanche-Olsen wrote: > Apropos of that, I have a question for the git experts out there. >[=E2=80=A6] > From this it is my guess that stashing in the middle of a merge with > conflicts is not safe, as the stash is not capable of holding multiple > versions of a single file. Or am I wrong about that? It appears I have stumbled upon the answer here: http://git.661346.n2.nabble.com/quot-fatal-git-write-tree-error-building-= trees-quot-from-git-stash-td7573736.html That post contains this bit: $ git stash foo: needs merge foo: needs merge foo: unmerged (aeaa7e5e87cf309a7368d5d92a71c1f9e6a8c9e7) foo: unmerged (a77fa514de2720c72c1a861de098595959a2c97a) foo: unmerged (4a622d2b991f1a19ba7be313a46dc6f03692cd0a) fatal: git-write-tree: error building trees Cannot save the current index state So git stash will very visibly fail in this situation. And that is good to know. (Lookm there is that =E2=80=9Cerror building tr= ees=E2=80=9D=20 message again!) =E2=80=93 Harald