all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* Slow merge of vc.el begins: "focus version"
@ 2007-10-06  8:32 Eric S. Raymond
  2007-10-06 10:03 ` Thien-Thi Nguyen
                   ` (3 more replies)
  0 siblings, 4 replies; 6+ messages in thread
From: Eric S. Raymond @ 2007-10-06  8:32 UTC (permalink / raw)
  To: emacs-devel

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Slow merge of vc.el begins: "focus version"
  2007-10-06  8:32 Slow merge of vc.el begins: "focus version" Eric S. Raymond
@ 2007-10-06 10:03 ` Thien-Thi Nguyen
  2007-10-06 13:09 ` John S. Yates, Jr.
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 6+ messages in thread
From: Thien-Thi Nguyen @ 2007-10-06 10:03 UTC (permalink / raw)
  To: emacs-devel

() "Eric S. Raymond" <esr@snark.thyrsus.com>
() Sat,  6 Oct 2007 04:32:52 -0400 (EDT)

   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.

how about "tree name"?

everyone understands "tree" to be directory tree, i think.
i prefer "name" over "version" because it's more general.

thi

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Slow merge of vc.el begins: "focus version"
  2007-10-06  8:32 Slow merge of vc.el begins: "focus version" Eric S. Raymond
  2007-10-06 10:03 ` 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
  3 siblings, 1 reply; 6+ messages in thread
From: John S. Yates, Jr. @ 2007-10-06 13:09 UTC (permalink / raw)
  To: Eric S. Raymond; +Cc: emacs-devel

On Sat,  6 Oct 2007 04:32:52 -0400 (EDT), ers wrote:

>      ..  I will probably start by merging, into both code and manual,
>the "workfile version" -> "focus version" change.  ...
>
>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.  

Given that the various supported vc backend use different terminology
I would to see a table listing emacs vc concepts and terms with the
corresponding terminology for each backend.

Also, given the dvc project expressed hope of ultimately shipping with
emacs I would hope that vc and dvc would settle on common terminology.

/john

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Slow merge of vc.el begins: "focus version"
  2007-10-06 13:09 ` John S. Yates, Jr.
@ 2007-10-06 13:55   ` Eric S. Raymond
  0 siblings, 0 replies; 6+ messages in thread
From: Eric S. Raymond @ 2007-10-06 13:55 UTC (permalink / raw)
  To: John S. Yates, Jr.; +Cc: Eric S. Raymond, emacs-devel

John S. Yates, Jr. <john@yates-sheets.org>:
> Given that the various supported vc backend use different terminology
> I would to see a table listing emacs vc concepts and terms with the
> corresponding terminology for each backend.

Good idea.  You could probably develop such a table without
much difficulty, and I encourage you to do so. 

It's not good for the long-term maintainence prospects of the mode 
that so few people understand this mapping of abstractions well. 
At the moment the set consists of myself and, probably, Stefan Monnier.
A third would be a good thing.
-- 
		<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Slow merge of vc.el begins: "focus version"
  2007-10-06  8:32 Slow merge of vc.el begins: "focus version" Eric S. Raymond
  2007-10-06 10:03 ` Thien-Thi Nguyen
  2007-10-06 13:09 ` John S. Yates, Jr.
@ 2007-10-06 22:04 ` Stefan Monnier
  2007-10-06 22:05 ` Stefan Monnier
  3 siblings, 0 replies; 6+ messages in thread
From: Stefan Monnier @ 2007-10-06 22:04 UTC (permalink / raw)
  To: Eric S. Raymond; +Cc: emacs-devel

> "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.

In the latest vc.el I've seen you've used "current focus version", but I see
no need for "focus" here (and I prefer "revision" to "version" here as
well), so why not "current revision"?  It's a terminology that I've often
seen used.


        Stefan

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Slow merge of vc.el begins: "focus version"
  2007-10-06  8:32 Slow merge of vc.el begins: "focus version" Eric S. Raymond
                   ` (2 preceding siblings ...)
  2007-10-06 22:04 ` Stefan Monnier
@ 2007-10-06 22:05 ` Stefan Monnier
  3 siblings, 0 replies; 6+ messages in thread
From: Stefan Monnier @ 2007-10-06 22:05 UTC (permalink / raw)
  To: Eric S. Raymond; +Cc: emacs-devel

> 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.

If you can slice your changes into several smaller patches, then that would
be great, indeed.


        Stefan

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2007-10-06 22:05 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-10-06  8:32 Slow merge of vc.el begins: "focus version" Eric S. Raymond
2007-10-06 10:03 ` 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

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.