all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: "Eric S. Raymond" <esr@snark.thyrsus.com>
To: emacs-devel@gnu.org
Subject: Slow merge of vc.el begins: "focus version"
Date: Sat,  6 Oct 2007 04:32:52 -0400 (EDT)	[thread overview]
Message-ID: <20071006083252.F366738032@snark> (raw)

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.
-- 
		<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>

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

             reply	other threads:[~2007-10-06  8:32 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-10-06  8:32 Eric S. Raymond [this message]
2007-10-06 10:03 ` Slow merge of vc.el begins: "focus version" Thien-Thi Nguyen
2007-10-06 13:09 ` John S. Yates, Jr.
2007-10-06 13:55   ` Eric S. Raymond
2007-10-06 22:04 ` Stefan Monnier
2007-10-06 22:05 ` Stefan Monnier

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20071006083252.F366738032@snark \
    --to=esr@snark.thyrsus.com \
    --cc=emacs-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.