From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Eric S. Raymond" Newsgroups: gmane.emacs.devel Subject: Post-merge issues in VC mode #1: terminology fixes Date: Wed, 10 Oct 2007 16:15:40 -0400 (EDT) Message-ID: <20071010201540.D658738032@snark> NNTP-Posting-Host: lo.gmane.org X-Trace: sea.gmane.org 1192047380 12322 80.91.229.12 (10 Oct 2007 20:16:20 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Wed, 10 Oct 2007 20:16:20 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Oct 10 22:16:18 2007 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1IfhyP-0001nT-If for ged-emacs-devel@m.gmane.org; Wed, 10 Oct 2007 22:16:05 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IfhyJ-0004E9-NN for ged-emacs-devel@m.gmane.org; Wed, 10 Oct 2007 16:15:59 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IfhxS-0003km-Ba for emacs-devel@gnu.org; Wed, 10 Oct 2007 16:15:06 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IfhxQ-0003jy-Iu for emacs-devel@gnu.org; Wed, 10 Oct 2007 16:15:05 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IfhxQ-0003js-Fl for emacs-devel@gnu.org; Wed, 10 Oct 2007 16:15:04 -0400 Original-Received: from static-71-162-243-5.phlapa.fios.verizon.net ([71.162.243.5] helo=snark) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1IfhxQ-0008VJ-1X for emacs-devel@gnu.org; Wed, 10 Oct 2007 16:15:04 -0400 Original-Received: by snark (Postfix, from userid 23) id D658738032; Wed, 10 Oct 2007 16:15:40 -0400 (EDT) X-Detected-Kernel: Linux 2.6 (newer, 2) 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 Xref: news.gmane.org gmane.emacs.devel:80530 Archived-At: I've spent the last several hours tackling the largest and (probably) most difficult of the post-merge issues; the inconsistent terminology resulting from the many layers of code conceptually harking back to different VCSes. Stefan was quite right to call this out as a problem. The code and manual now use the term 'revision' consistently for what we've been inconsistently calling a 'version' or 'revision', that is a time slice from a version-controlled history. The terms 'current' and 'focus' are gone; the term used everywhere now is the SVN-like 'working revision'. In particular, 'workfile-version' is everywhere replaced by 'working-revision'. This term is compatible with changeset-oriented VCSes. I think the manual is going to need more work to reflect the fact that RCS-style x.y numbering is being superseded in newer VCs by integer changeset IDs. I'll try to get to that this evening. In general the VC portions of the manual need to be dragged into the 21st century; there is way too much focus on ancient VCSes and scant coverage of more modern ones. I'll see what I can do. -- Eric S. Raymond As war and government prove, insanity is the most contagious of diseases. -- Edward Abbey