From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Chong Yidong <cyd@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: Doc of vc-next-action
Date: Tue, 13 Dec 2011 09:31:11 -0500 [thread overview]
Message-ID: <jwv4nx4fstn.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <87r508am19.fsf@gnu.org> (Chong Yidong's message of "Tue, 13 Dec 2011 16:55:14 +0800")
> I'd like to get a second opinion on the docstring of vc-next-action:
> If every file is not already registered, this registers each one for version
> control. This does an add, but not a commit.
> If every file is added but not committed, each one is committed.
> If every working file is changed, but the corresponding repository file is
> unchanged, this pops up a buffer for entry of a log message; when the
> message has been entered, it checks in the resulting changes along
> with the logmessage as change commentary. A writable file is retained.
> If the repository file is changed, you are asked if you want to
> merge in the changes into your working copy.
> The descriptions in No. 3 and 4 look like CVS-isms. Regarding No. 3, on
> distributed VCSes we don't check that "the corresponding repository file
> is unchanged", as that's not a meaningful condition. And No. 4 seems to
> refer to the `needs-update' value of vc-state, which isn't used on
> distributed VCSes. Correct?
I think you're right. And IIUC you're even right for CVS in the
(vc-cvs-)stay-local case (which is and was the default).
Stefan
prev parent reply other threads:[~2011-12-13 14:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-13 8:55 Doc of vc-next-action Chong Yidong
2011-12-13 14:31 ` Stefan Monnier [this message]
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=jwv4nx4fstn.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=cyd@gnu.org \
--cc=emacs-devel@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.