all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* CVS commits and logs
@ 2006-11-04 11:40 Eli Zaretskii
  2006-11-04 12:29 ` Eli Zaretskii
                   ` (2 more replies)
  0 siblings, 3 replies; 111+ messages in thread
From: Eli Zaretskii @ 2006-11-04 11:40 UTC (permalink / raw)


It looks like some people are not aware of the guidelines about CVS
commits and commit logs, or maybe those guidelines are ambiguous or
unclear, because the style of the log text differs considerably from
one maintainer to another, and hints on commit procedure that is not
according to what I know.  See the few examples below.

I think Richard should decide what is the canonical form and what are
the guidelines that everybody should follow, and we should then
describe those guidelines in some file in admin/.  I describe here
the rules I know about, as a starting point:

  . CVS log entries should be simply the ChangeLog entries with the
    file name and the leading TABs stripped.  It is okay to reformat
    and refill the text to make a better use of the line real estate
    after the leading TABs were removed, but otherwise the text should
    remain intact (but see below for an exception).

  . Each file should be committed separately, even if the changes are
    related, and the CVS log entry should be for the changes in that
    file only.  In particular, the modified files and the ChangeLog
    file with the appropriate log entry should be committed separately
    (thus the CVS log entries for ChangeLog files should never include
    log entries for the modified files).  Exception: it is okay to
    commit several changes to a single ChangeLog file in one "cvs ci"
    command if those changes are related to the same feature/bugfix.

  . Since the previous rule separates the text for similar or related
    changes in different files, entries that say "Ditto." or otherwise
    refer to text for other files' entries should be rewritten to be
    self-contained in the CVS log.  This is an exception from the
    first rule, which says that the ChangeLog text should generally
    remain intact.

  . The ChangeLog files should be committed with an empty log message
    (unless this is a real change in the ChangeLog file itself, not an
    addition of log entries).

Here are some random examples of the various styles we currently have
in CVS log (the entries are indented 2 spaces to the right):

lisp/ChangeLog:

  revision 1.10244
  date: 2006-11-03 13:54:32 +0000;  author: ramprasadb;  state: Exp;  lines: +4 -0
  *** empty log message ***
  ----------------------------
  revision 1.10243
  date: 2006-11-02 23:46:14 +0000;  author: monnier;  state: Exp;  lines: +8 -0
  (server-auth-key): Remove.  Replace by a process-property.
  (server-start): Don't remove the file of the previous process, but
  instead clear out the place for the new file.
  (server-start): Set the :auth-key property.
  (server-process-filter): Use the :auth-key property.
  ----------------------------
  revision 1.10232
  date: 2006-10-30 21:34:15 +0000;  author: cyd;  state: Exp;  lines: +8 -0
	  * tutorial.el: Move defvars to avoid bytecomp warnings.
	  (tutorial--find-changed-keys): Check if viper-current-state is
	  bound before using it.
	  (help-with-tutorial): Check if viper-tutorial is defined before
	  using it.
  ----------------------------
  revision 1.10200
  date: 2006-10-18 14:05:16 +0000;  author: jhd;  state: Exp;  lines: +6 -0
   * term/x-win.el (res-geometry): Don't set geometry from Xresources
   to default-frame-alist if default-frame-alist already contains
   widht/height.
  ----------------------------
  revision 1.10182
  date: 2006-10-11 06:47:35 +0000;  author: monnier;  state: Exp;  lines: +359 -0
  Merge from upstream, upto version 5.22.
  After 5.0:
   `cperl-add-tags-recurse-noxs-fullpath': new function (for -batch mode)

   Fine-grained changelog:
  `cperl-hook-after-change':      New configuration variable
  `cperl-vc-sccs-header': Likewise.
  `cperl-vc-sccs-header': Likewise.
  `cperl-vc-header-alist':        Default via two preceding variables
  `cperl-invalid-face':   Remove double quoting under XEmacs


lisp/faces.el:

  revision 1.354
  date: 2006-09-14 23:54:44 +0000;  author: rms;  state: Exp;  lines: +1 -1
  (mode-line-faces): Group mode-line instead of modeline.
  ----------------------------
  revision 1.351
  date: 2006-06-28 23:29:26 +0000;  author: nickrob;  state: Exp;  lines: +1 -1
  * help-mode.el (help-xref-symbol-regexp): Add property as a keyword
  for ignoring links.

  * faces.el (read-face-name): Use it.
  ----------------------------
  revision 1.344
  date: 2005-11-20 15:24:27 +0000;  author: cyd;  state: Exp;  lines: +5 -11
	  * faces.el: Revert 2005-11-17 change.  :ignore-defface is now
	  handled automagically.
  ----------------------------
  revision 1.321
  date: 2005-06-22 01:22:40 +0000;  author: miles;  state: Exp;  lines: +1 -1
  Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-438

  Rename vertical-divider face to vertical-border

  2005-06-22  Miles Bader  <miles@gnu.org>

     * lisp/faces.el (vertical-border): Renamed from `vertical-divider'.

  2005-06-22  Miles Bader  <miles@gnu.org>

     * man/display.texi (Faces): Change `vertical-divider' to `vertical-border'.

  2005-06-22  Miles Bader  <miles@gnu.org>

     * src/xfaces.c (Qvertical_border): Renamed from `Qvertical_divider'.
     (realize_basic_faces, syms_of_xfaces): Update references to it.
     * src/dispextern.h (enum face_id): Rename `VERTICAL_DIVIDER_FACE_ID'
     to `VERTICAL_BORDER_FACE_ID'.
     * src/dispnew.c (build_frame_matrix_from_leaf_window): Update references.
  ----------------------------

^ permalink raw reply	[flat|nested] 111+ messages in thread
* Switching to Subversion
@ 2006-11-14 20:16 Jim Blandy
  0 siblings, 0 replies; 111+ messages in thread
From: Jim Blandy @ 2006-11-14 20:16 UTC (permalink / raw)


I designed the Subversion repository structure, and began the work on
the first filesystem implementation, so I can answer some of the "what
were they thinking?" questions that have come up on this thread.

We were aware from the beginning of the importance of merging.  We had
long discussions on what merging should mean, and the fellow who
handles version control for HP's inkjet printer division (they use a
big changeset engine) came to talk to us about changesets.  We all
agreed that changeset-based systems with interfaces like Darcs and
BitKeeper were The Right Thing, and the most useful way to think about
the whole activity of collaborative development.

However, we didn't implement that because we couldn't see any way to
do it in a way that scales to very old repositories.  For example, the
GCC repository has 118807 revisions in it at the moment, and handles
them just fine.  I don't see how a system with a repository structure
like Darcs (which I use and absolutely love) is going to handle that,
unless you're willing to rearrange your repository to trade speed for
historic detail.  And there have been comments from Larry McVoy to the
effect of, "big deal, everyone falls down with a few tens of thousands
of revisions".  Subversion has demonstrated that that's not so.

>From discussions with other people who follow these things more
closely, I understand that Mercurial has an excellent repository
structure: very compact, very fast, and very versatile.  The
Subversion project has plans --- which should be weighed as just that,
plans and talk --- to incorporate some of Mercurial's characteristics
in its merge support.

I do occasionally see a tendency in programming circles for people who
have recognized others' good ideas to adopt the strut earned by the
person who actually had them.  It always looks a little strange.

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

end of thread, other threads:[~2006-11-28 12:06 UTC | newest]

Thread overview: 111+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-11-04 11:40 CVS commits and logs Eli Zaretskii
2006-11-04 12:29 ` Eli Zaretskii
2006-11-04 12:53   ` Juanma Barranquero
2006-11-04 13:23     ` Eli Zaretskii
2006-11-04 13:44       ` Juanma Barranquero
2006-11-04 13:57         ` Eli Zaretskii
2006-11-04 14:37           ` Juanma Barranquero
2006-11-04 16:06             ` Reiner Steib
2006-11-04 22:30               ` Juanma Barranquero
2006-11-05 19:22               ` Richard Stallman
2006-11-05  7:08         ` Richard Stallman
2006-11-05 21:22           ` Juanma Barranquero
2006-11-04 22:28   ` Jason Rumney
2006-11-05  6:13     ` Eli Zaretskii
2006-11-05  7:08 ` Richard Stallman
2006-11-05 23:15 ` Bill Wohler
2006-11-06  2:30   ` Miles Bader
2006-11-06 16:08     ` Richard Stallman
2006-11-06 19:38       ` Miles Bader
2006-11-07 16:47         ` Richard Stallman
2006-11-07 22:44           ` Miles Bader
2006-11-09  0:53             ` Richard Stallman
2006-11-09  4:47               ` Miles Bader
2006-11-09  6:01                 ` Bill Wohler
2006-11-11  2:11                 ` Richard Stallman
2006-11-11  3:24                   ` Miles Bader
2006-11-11 10:03                     ` Andreas Schwab
2006-11-11 12:51                       ` Miles Bader
2006-11-11 17:00                         ` Switching to Subversion (was: CVS commits and logs) Bill Wohler
2006-11-11 20:00                           ` Switching to Subversion Romain Francoise
2006-11-12  1:20                             ` Bill Wohler
2006-11-12 11:26                               ` Romain Francoise
2006-11-12 21:12                               ` Richard Stallman
2006-11-12 21:20                                 ` David Kastrup
2006-11-12 21:49                                   ` Juanma Barranquero
2006-11-12 22:45                                   ` Miles Bader
2006-11-12 23:17                                     ` Juanma Barranquero
2006-11-12 23:29                                       ` Miles Bader
2006-11-12 23:40                                         ` Juanma Barranquero
2006-11-12 23:59                                           ` Miles Bader
2006-11-13  8:02                                         ` stephen
2006-11-13 12:38                                           ` Bruce Stephens
2006-11-13 20:26                                             ` Juanma Barranquero
2006-11-12 21:39                                 ` Juanma Barranquero
2006-11-12 22:43                                   ` Sascha Wilde
2006-11-12 23:22                                     ` Miles Bader
2006-11-12 23:37                                       ` Juanma Barranquero
2006-11-12 23:54                                         ` Miles Bader
2006-11-12 23:58                                           ` Juanma Barranquero
2006-11-13  0:15                                             ` Miles Bader
2006-11-13  1:20                                               ` Juanma Barranquero
2006-11-13 16:26                                                 ` Stefan Monnier
2006-11-13 16:53                                                   ` Juanma Barranquero
2006-11-13 16:59                                                     ` Juanma Barranquero
2006-11-13 20:13                                                     ` Stefan Monnier
2006-11-14  4:50                                                       ` Bill Wohler
2006-11-14  6:49                                                         ` Stefan Monnier
2006-11-27 21:42                                                       ` Jari Aalto
2006-11-28  4:52                                                         ` Miles Bader
2006-11-28 12:06                                                           ` Jari Aalto
2006-11-13  8:41                                       ` Sascha Wilde
2006-11-13  8:50                                         ` David Kastrup
2006-11-13  8:59                                           ` Juanma Barranquero
2006-11-13  9:11                                           ` Sascha Wilde
2006-11-13  9:26                                             ` David Kastrup
2006-11-13  9:53                                               ` dhruva
2006-11-13 10:55                                                 ` Thomas Arendsen Hein
2006-11-28 11:29                                                 ` Jari Aalto
2006-11-13 12:38                                               ` Sascha Wilde
2006-11-13 12:40                                                 ` Juanma Barranquero
2006-11-14  2:27                                                   ` Han-Wen Nienhuys
2006-11-13 12:55                                                 ` David Kastrup
2006-11-13 14:49                                                   ` Sascha Wilde
2006-11-13 14:57                                                     ` Juanma Barranquero
2006-11-13  8:51                                         ` Miles Bader
2006-11-13 11:43                                           ` Thomas Arendsen Hein
2006-11-13 12:31                                             ` Juanma Barranquero
2006-11-13 13:16                                             ` Miles Bader
2006-11-13 13:35                                               ` Juanma Barranquero
2006-11-13 13:54                                                 ` David Kastrup
2006-11-13 14:08                                                   ` Juanma Barranquero
2006-11-14  3:53                                                 ` Bill Wohler
2006-11-13 14:46                                               ` Sascha Wilde
2006-11-13 22:31                                                 ` Miles Bader
2006-11-13 22:44                                                   ` Juanma Barranquero
2006-11-14  6:38                                                   ` Stefan Monnier
2006-11-13 11:20                                       ` Thomas Arendsen Hein
2006-11-13 13:11                                         ` Miles Bader
2006-11-13 14:51                                           ` Sascha Wilde
2006-11-13 16:55                                           ` Thomas Arendsen Hein
2006-11-13 22:37                                             ` Miles Bader
2006-11-13 20:15                                       ` Richard Stallman
2006-11-14  2:49                                         ` Miles Bader
2006-11-13  8:47                                   ` joakim
2006-11-13  8:56                                     ` Juanma Barranquero
2006-11-13  9:05                                       ` joakim
2006-11-14  4:55                                     ` Bill Wohler
2006-11-13 20:15                                   ` Richard Stallman
2006-11-14  1:53                                 ` Juliusz Chroboczek
2006-11-14  2:10                                   ` Masatake YAMATO
2006-11-14  3:05                                   ` Eric Hanchrow
2006-11-14  3:23                                     ` Miles Bader
2006-11-12  5:14                     ` CVS commits and logs Richard Stallman
2006-11-12  9:45                       ` Miles Bader
2006-11-13  9:44                         ` Richard Stallman
2006-11-07 18:07       ` Reiner Steib
2006-11-07 20:33         ` Eli Zaretskii
2006-11-08  1:50           ` Miles Bader
2006-11-11  9:43             ` Reiner Steib
2006-11-06  4:21   ` Eli Zaretskii
  -- strict thread matches above, loose matches on Subject: below --
2006-11-14 20:16 Switching to Subversion Jim Blandy

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.