* Doc of vc-next-action
@ 2011-12-13 8:55 Chong Yidong
2011-12-13 14:31 ` Stefan Monnier
0 siblings, 1 reply; 2+ messages in thread
From: Chong Yidong @ 2011-12-13 8:55 UTC (permalink / raw)
To: emacs-devel
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?
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: Doc of vc-next-action
2011-12-13 8:55 Doc of vc-next-action Chong Yidong
@ 2011-12-13 14:31 ` Stefan Monnier
0 siblings, 0 replies; 2+ messages in thread
From: Stefan Monnier @ 2011-12-13 14:31 UTC (permalink / raw)
To: Chong Yidong; +Cc: emacs-devel
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-12-13 14:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-13 8:55 Doc of vc-next-action Chong Yidong
2011-12-13 14:31 ` Stefan Monnier
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).