From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dan Nicolaescu Newsgroups: gmane.emacs.devel Subject: Re: C-x v u for added files in vc-git Date: Thu, 3 Dec 2009 20:49:03 -0800 (PST) Message-ID: <200912040449.nB44n3hn002309@godzilla.ics.uci.edu> References: <200912030606.nB366cKS021507@godzilla.ics.uci.edu> <20091203090205.8k74zmgqe8ko8k8o@webmail.mnet-online.de> <200912030909.nB3993lF022865@godzilla.ics.uci.edu> <20091203131514.cq73r2k3cwso8sow@webmail.mnet-online.de> <200912031822.nB3IMZt0027156@godzilla.ics.uci.edu> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1259902356 27920 80.91.229.12 (4 Dec 2009 04:52:36 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 4 Dec 2009 04:52:36 +0000 (UTC) Cc: mathias@mnet-mail.de, emacs-devel@gnu.org To: Miles Bader Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Dec 04 05:52:29 2009 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1NGQ9a-0003OV-T7 for ged-emacs-devel@m.gmane.org; Fri, 04 Dec 2009 05:52:27 +0100 Original-Received: from localhost ([127.0.0.1]:54102 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NGQ9a-0002WU-GW for ged-emacs-devel@m.gmane.org; Thu, 03 Dec 2009 23:52:26 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NGQ9U-0002WK-Mv for emacs-devel@gnu.org; Thu, 03 Dec 2009 23:52:20 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NGQ9P-0002Vk-0C for emacs-devel@gnu.org; Thu, 03 Dec 2009 23:52:19 -0500 Original-Received: from [199.232.76.173] (port=58378 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NGQ9O-0002Vh-T8 for emacs-devel@gnu.org; Thu, 03 Dec 2009 23:52:14 -0500 Original-Received: from paul-mcgann-v0.ics.uci.edu ([128.195.1.147]:48907) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NGQ9N-0005rf-Cf; Thu, 03 Dec 2009 23:52:13 -0500 Original-Received: from godzilla.ics.uci.edu (godzilla.ics.uci.edu [128.195.10.101]) by paul-mcgann-v0.ics.uci.edu (8.13.8/8.13.8) with ESMTP id nB44n4SF013007 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 3 Dec 2009 20:49:04 -0800 Original-Received: (from dann@localhost) by godzilla.ics.uci.edu (8.13.8+Sun/8.13.6/Submit) id nB44n3hn002309; Thu, 3 Dec 2009 20:49:03 -0800 (PST) In-Reply-To: (Miles Bader's message of "Fri, 04 Dec 2009 12:39:03 +0900") Original-Lines: 27 X-ICS-MailScanner-Information: Please send mail to helpdesk@ics.uci.edu or more information X-ICS-MailScanner-ID: nB44n4SF013007 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=0.561, required 5, autolearn=disabled, ALL_TRUSTED -1.44, GAPPY_SUBJECT 2.00) X-ICS-MailScanner-From: dann@godzilla.ics.uci.edu X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:118232 Archived-At: Miles Bader writes: > Dan Nicolaescu writes: > > 3. is exactly the goal for the command, to get rid of unwanted changes! > > > > So it seems that if we do the sequence: > > > > git checkout HEAD > > git rm --cached > > > > that take care of all situations. > > I don't know _what_ people expect "C-x v u" to do for files that were > never committed, .... but the above sequence (specifically, the "git co") > seems to reset the file's contents to the contents it had at the time it > was added with "git add", in addition to removing it from the list of > added files. That's not good, we need something that just removes it from the index and keeps the current contents. > [What happens with CVS?] With CVS you are stuck with a file in the "add" state. With svn, bzr, hg you can use C-x v u to transition from the "add" VC state to "unregistered".