From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Chong Yidong Newsgroups: gmane.emacs.devel Subject: Doc of vc-next-action Date: Tue, 13 Dec 2011 16:55:14 +0800 Message-ID: <87r508am19.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1323766543 24450 80.91.229.12 (13 Dec 2011 08:55:43 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 13 Dec 2011 08:55:43 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Dec 13 09:55:33 2011 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1RaO96-00016m-7J for ged-emacs-devel@m.gmane.org; Tue, 13 Dec 2011 09:55:32 +0100 Original-Received: from localhost ([::1]:44708 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RaO95-0002aY-Gx for ged-emacs-devel@m.gmane.org; Tue, 13 Dec 2011 03:55:31 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:45911) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RaO90-0002aR-S4 for emacs-devel@gnu.org; Tue, 13 Dec 2011 03:55:30 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RaO8w-0002Nc-Qm for emacs-devel@gnu.org; Tue, 13 Dec 2011 03:55:26 -0500 Original-Received: from fencepost.gnu.org ([140.186.70.10]:39645) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RaO8w-0002NY-P1 for emacs-devel@gnu.org; Tue, 13 Dec 2011 03:55:22 -0500 Original-Received: from [155.69.19.112] (port=44356 helo=furball) by fencepost.gnu.org with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1RaO8v-0003WM-TM for emacs-devel@gnu.org; Tue, 13 Dec 2011 03:55:22 -0500 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 140.186.70.10 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:146684 Archived-At: 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?