From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Doc of vc-next-action Date: Tue, 13 Dec 2011 09:31:11 -0500 Message-ID: References: <87r508am19.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1323786698 7669 80.91.229.12 (13 Dec 2011 14:31:38 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 13 Dec 2011 14:31:38 +0000 (UTC) Cc: emacs-devel@gnu.org To: Chong Yidong Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Dec 13 15:31:35 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 1RaTOH-0001UV-VZ for ged-emacs-devel@m.gmane.org; Tue, 13 Dec 2011 15:31:34 +0100 Original-Received: from localhost ([::1]:54198 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RaTOH-00019U-Iw for ged-emacs-devel@m.gmane.org; Tue, 13 Dec 2011 09:31:33 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:59888) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RaTOB-00018O-LS for emacs-devel@gnu.org; Tue, 13 Dec 2011 09:31:31 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RaTO5-0003T4-U9 for emacs-devel@gnu.org; Tue, 13 Dec 2011 09:31:27 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:63820) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RaTNw-0003Ri-Oq; Tue, 13 Dec 2011 09:31:12 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av0EAKlg505FxLI7/2dsb2JhbABDqyGBBoFyAQEEAVYjBQsLDiYSFBgNJIgPtgOLaASIMJo4hFA X-IronPort-AV: E=Sophos;i="4.71,345,1320642000"; d="scan'208";a="152092392" Original-Received: from 69-196-178-59.dsl.teksavvy.com (HELO ceviche.home) ([69.196.178.59]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 13 Dec 2011 09:31:11 -0500 Original-Received: by ceviche.home (Postfix, from userid 20848) id 537B66619A; Tue, 13 Dec 2011 09:31:11 -0500 (EST) In-Reply-To: <87r508am19.fsf@gnu.org> (Chong Yidong's message of "Tue, 13 Dec 2011 16:55:14 +0800") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.92 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.181 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:146688 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? 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