all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Dan Nicolaescu <dann@ics.uci.edu>
To: Miles Bader <miles@gnu.org>
Cc: mathias@mnet-mail.de, emacs-devel@gnu.org
Subject: Re: C-x v u for added files in vc-git
Date: Thu, 3 Dec 2009 20:49:03 -0800 (PST)	[thread overview]
Message-ID: <200912040449.nB44n3hn002309@godzilla.ics.uci.edu> (raw)
In-Reply-To: <buod42vqug8.fsf@dhlpc061.dev.necel.com> (Miles Bader's message of "Fri, 04 Dec 2009 12:39:03 +0900")

Miles Bader <miles@gnu.org> writes:

  > Dan Nicolaescu <dann@ics.uci.edu> 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 <file>
  > > git rm --cached <file>
  > >
  > > 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".




  reply	other threads:[~2009-12-04  4:49 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-12-03  6:06 C-x v u for added files in vc-git Dan Nicolaescu
2009-12-03  8:02 ` mathias
2009-12-03  9:09   ` Dan Nicolaescu
2009-12-03 12:15     ` mathias
2009-12-03 18:22       ` Dan Nicolaescu
2009-12-04  3:39         ` Miles Bader
2009-12-04  4:49           ` Dan Nicolaescu [this message]
2009-12-04  5:24             ` Miles Bader
2009-12-04  5:44               ` Dan Nicolaescu
2009-12-04  7:58                 ` Miles Bader
2009-12-04 18:55                   ` Dan Nicolaescu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200912040449.nB44n3hn002309@godzilla.ics.uci.edu \
    --to=dann@ics.uci.edu \
    --cc=emacs-devel@gnu.org \
    --cc=mathias@mnet-mail.de \
    --cc=miles@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.