From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andre Spiegel Newsgroups: gmane.emacs.devel Subject: Re: Two question about VC. Date: Thu, 24 Mar 2005 10:42:08 +0100 Message-ID: <1111657328.2424.31.camel@localhost> References: <200503240247.j2O2lve20934@raven.dms.auburn.edu> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 7bit X-Trace: sea.gmane.org 1111658010 5646 80.91.229.2 (24 Mar 2005 09:53:30 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Thu, 24 Mar 2005 09:53:30 +0000 (UTC) Cc: Stefan Monnier , emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 24 10:53:29 2005 Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1DEP1j-00086U-Tu for ged-emacs-devel@m.gmane.org; Thu, 24 Mar 2005 10:53:20 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DEPGz-0001Dh-NM for ged-emacs-devel@m.gmane.org; Thu, 24 Mar 2005 05:09:05 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DEPAR-0007YS-An for emacs-devel@gnu.org; Thu, 24 Mar 2005 05:02:19 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DEPAK-0007XX-SQ for emacs-devel@gnu.org; Thu, 24 Mar 2005 05:02:15 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DEPAJ-0007V3-EZ for emacs-devel@gnu.org; Thu, 24 Mar 2005 05:02:11 -0500 Original-Received: from [193.113.160.41] (helo=mail.o2.co.uk) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DEOr2-0001Qf-EV for emacs-devel@gnu.org; Thu, 24 Mar 2005 04:42:16 -0500 Original-Received: from [217.231.159.163] (217.231.159.163) by mail.o2.co.uk (7.0.042) id 424026710004663F; Thu, 24 Mar 2005 09:38:49 +0000 Original-To: Luc Teirlinck In-Reply-To: <200503240247.j2O2lve20934@raven.dms.auburn.edu> X-Mailer: Evolution 2.0.4 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org X-MailScanner-To: ged-emacs-devel@m.gmane.org Xref: news.gmane.org gmane.emacs.devel:35088 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:35088 On Wed, 2005-03-23 at 20:47 -0600, Luc Teirlinck wrote: > 1. `(emacs)Branches' contains: > > Please note, however, that branches are only supported for RCS at > the moment. > > I do not use branches myself, but is this really still up to date? > > Would the following replacement text be correct: > > Please note, however, that branches are not supported for SCCS. I am not sure about MCVS, SVN, and Arch, but if we support branches for all of them (which I tend to assume), then the replacement is correct. > 2. (emacs)Local Version Control contains: > > But if you do this, the revision numbers in the RCS master no longer > correspond to those of CVS. Technically, this is not a problem, but it > can become difficult to keep track of what is in the CVS repository and > what is not. So we suggest that you return from time to time to > CVS-only operation, using `C-u C-x v v cvs '. > > `C-u C-x v v cvs '? Is that not going to try to commit to the > repository? Is `C-x v b' meant? No, C-u C-x v v cvs is indeed the intention, because committing back to CVS is the only way to get the revision numbers consistent with CVS again. Otherwise, you would stay on a local RCS branch that was forked off some CVS revision in the past. That final sentence could be clarified as: So we suggest that you return from time to time to CVS-only operation, committing your local changes back to the repository using 'C-u C-x v v cvs RET'.