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: Slow merge of vc.el begins: "focus version" Date: Sat, 6 Oct 2007 04:32:52 -0400 (EDT) Message-ID: <20071006083252.F366738032@snark> NNTP-Posting-Host: lo.gmane.org X-Trace: sea.gmane.org 1191662623 22019 80.91.229.12 (6 Oct 2007 09:23:43 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sat, 6 Oct 2007 09:23:43 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Oct 06 11:23:41 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 1Ie5sp-0008UD-Sd for ged-emacs-devel@m.gmane.org; Sat, 06 Oct 2007 11:23:40 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ie5sk-0003Rk-Um for ged-emacs-devel@m.gmane.org; Sat, 06 Oct 2007 05:23:35 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Ie5Ym-0004g1-FP for emacs-devel@gnu.org; Sat, 06 Oct 2007 05:02:56 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Ie5Yk-0004do-JZ for emacs-devel@gnu.org; Sat, 06 Oct 2007 05:02:54 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ie5Yk-0004dX-D2 for emacs-devel@gnu.org; Sat, 06 Oct 2007 05:02:54 -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 1Ie55U-0002LM-Jj for emacs-devel@gnu.org; Sat, 06 Oct 2007 04:32:40 -0400 Original-Received: by snark (Postfix, from userid 23) id F366738032; Sat, 6 Oct 2007 04:32:52 -0400 (EDT) X-Detected-Kernel: Linux 2.6 (newer, 2) X-Mailman-Approved-At: Sat, 06 Oct 2007 05:23:28 -0400 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:80322 Archived-At: Dan Nicolaescu did an extremely helpful thing by reordering the code in vc.el, but as I feared the diff is still quite large and noisy. There was really no avoiding this, as large portions of the mode needed a rewrite. In order to make auditing of the diff more feasible, I'm going to merge into head some of the bits from my version that don't make logic changes. I will probably start by merging, into both code and manual, the "workfile version" -> "focus version" change. It is responsible for a lot of the noise. I am not really happy about introducing a new term, especially one that isn't lifted from VCS terminology already current. But, as I explained to Dan, none of the VCSes have evolved an unambiguous term of art for this. "Workfile version" is, I believe, strictly an Emacsism these days. It becomes inappropriate and misleading when we are speaking of a VCS in which version numbers are not a per-file property but associated with changesets. This is true of all VCSes from Subversion onwards. I suppose "working-copy version" might be more explicit while avoiding the problem. I might switch both my code and the Emacs head revision to use that. I'll have to try altering the manual both ways and seeing how it reads. -- Eric S. Raymond To make inexpensive guns impossible to get is to say that you're putting a money test on getting a gun. It's racism in its worst form. -- Roy Innis, president of the Congress of Racial Equality (CORE), 1988