bug-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Feature request/ideas


From: Frank Hemer
Subject: Re: Feature request/ideas
Date: Fri, 25 Feb 2005 02:41:12 +0100
User-agent: KMail/1.5.1

On Thursday 24 February 2005 17:03, Derek Price wrote:
> Frank Hemer wrote:
> | I have added support for the commitid in about the same manner as
> | it is implemented in cvsnt, so this shouldn't be a compatibility
> | issue. However, the commitid is as well added to the 1.1 and
> | 1.1.1.1 revisions at the initial import.
> |
> | Here goes the patch:
>
> This patch looks pretty good at first glance, but it needs test cases
> in src/sanity.sh and documentation in doc/RCSFILES and doc/cvs.texinfo
> before it may be committed.  Please see the HACKING file from the
> source distribution for more on the CVS patch acceptance policy, and
> the TESTS file on how to write sanity.sh test cases.

Once again, here it is:

Index: ChangeLog
===================================================================
RCS file: /cvs/ccvs/ChangeLog,v
retrieving revision 1.1162
diff -u -r1.1162 ChangeLog
--- ChangeLog   24 Feb 2005 22:22:53 -0000      1.1162
+++ ChangeLog   25 Feb 2005 01:35:53 -0000
@@ -1,3 +1,7 @@
+2005-02-24  Frank Hemer <address@hidden>
+
+       * NEWS: Note commitid feature.
+
 2005-02-24 Derek Price <address@hidden>
 
        * configure.in:  Disable proxy when either the client or server are
Index: NEWS
===================================================================
RCS file: /cvs/ccvs/NEWS,v
retrieving revision 1.299
diff -u -r1.299 NEWS
--- NEWS        24 Feb 2005 22:22:53 -0000      1.299
+++ NEWS        25 Feb 2005 01:35:53 -0000
@@ -3,6 +3,11 @@
 
 NEW FEATURES
 
+* CVS creates a unique session id that gets written to the RCS files during
+  import and commit. When committing several files at once, they all get the
+  same 'commitid'. The commitid becomes visible with log and status commands,
+  and is derived and compatible with the cvsnt project.
+
 * CVS now compiles correctly configured with --disable-client again.
 
 * CVS now accepts the <tag>:<date> format, which has long been acceptable as 
an
Index: doc/RCSFILES
===================================================================
RCS file: /cvs/ccvs/doc/RCSFILES,v
retrieving revision 1.15
diff -u -r1.15 RCSFILES
--- doc/RCSFILES        23 Dec 1998 16:16:25 -0000      1.15
+++ doc/RCSFILES        25 Feb 2005 01:35:53 -0000
@@ -115,6 +115,11 @@
 in the delta nodes should include `README'; CVS will not operate
 properly if this is not done.
 
+Newphrases are also used to implement the 'commitid' feature. The
+following new keyword is defined:
+
+   commitid
+
 The rules regarding keyword expansion are not documented along with
 the rest of the RCS file format; they are documented in the co(1)
 manpage in the RCS 5.7 distribution.  See also the "Keyword
Index: doc/cvs.texinfo
===================================================================
RCS file: /cvs/ccvs/doc/cvs.texinfo,v
retrieving revision 1.636
diff -u -r1.636 cvs.texinfo
--- doc/cvs.texinfo     24 Feb 2005 00:10:24 -0000      1.636
+++ doc/cvs.texinfo     25 Feb 2005 01:36:03 -0000
@@ -6184,6 +6184,8 @@
 from, and the @code{Repository revision} which is the
 latest revision in the repository for the branch in
 use.
+The @samp{Commit Identifier} reflects the unique commitid
+of the @code{commit}.
 @c FIXME: should we clarify "in use"?  The answer is
 @c sticky tags, and trying to distinguish branch sticky
 @c tags from non-branch sticky tags seems rather awkward
@@ -9445,6 +9447,12 @@
 or use the @samp{-F @var{file}} option to specify
 that the argument file contains the log message.
 
+At @code{commit}, a unique commitid is placed in the @sc{rcs}
+file inside the repository. All files committed at once
+get the same commitid. The commitid can be retrieved with
+the @code{log} and @code{status} command; see @ref{log},
address@hidden
+
 @menu
 * commit options::              commit options
 * commit examples::             commit examples
@@ -10729,11 +10737,10 @@
 the @dfn{head} revision (the latest revision on the
 trunk), all symbolic names (tags) and some other
 things.  For each revision, the revision number, the
-date, the
-author, the number of lines added/deleted and the log
-message are printed.  All dates are displayed in local
-time at the client.  This is typically specified in the
address@hidden environment variable, which can be set to
+date, the author, the number of lines added/deleted, the commitid
+and the log message are printed.  All dates are displayed
+in local time at the client. This is typically specified in
+the @code{$TZ} environment variable, which can be set to
 govern how @code{log} displays dates.
 
 @strong{Note: @code{log} uses @samp{-R} in a way that conflicts
Index: src/cvs.h
===================================================================
RCS file: /cvs/ccvs/src/cvs.h,v
retrieving revision 1.328
diff -u -r1.328 cvs.h
--- src/cvs.h   23 Feb 2005 19:59:49 -0000      1.328
+++ src/cvs.h   25 Feb 2005 01:36:04 -0000
@@ -896,3 +896,6 @@
 void cvs_flusherr (void);
 void cvs_flushout (void);
 void cvs_output_tagged (const char *, const char *);
+
+#define GLOBAL_SESSION_ID_LENGTH 64
+extern char global_session_id[GLOBAL_SESSION_ID_LENGTH];
Index: src/import.c
===================================================================
RCS file: /cvs/ccvs/src/import.c,v
retrieving revision 1.166
diff -u -r1.166 import.c
--- src/import.c        24 Feb 2005 22:21:08 -0000      1.166
+++ src/import.c        25 Feb 2005 01:36:05 -0000
@@ -1275,6 +1275,9 @@
        if (fprintf (fprcs, "next    %s;\012", add_vhead) < 0)
            goto write_error;
 
+       if (fprintf (fprcs, "commitid        %s;\012", global_session_id) < 0)
+           goto write_error;
+
 #ifdef PRESERVE_PERMISSIONS_SUPPORT
        /* Store initial permissions if necessary. */
        if (config->preserve_perms)
@@ -1306,6 +1309,9 @@
        if (fprintf (fprcs, "next     ;\012") < 0)
            goto write_error;
 
+       if (fprintf (fprcs, "commitid        %s;\012", global_session_id) < 0)
+           goto write_error;
+
 #ifdef PRESERVE_PERMISSIONS_SUPPORT
        /* Store initial permissions if necessary. */
        if (config->preserve_perms)
@@ -1322,7 +1328,8 @@
                fprintf (fprcs, "date     %s;  author %s;  state Exp;\012",
                         altdate1, author) < 0 ||
                fprintf (fprcs, "branches ;\012") < 0 ||
-               fprintf (fprcs, "next     ;\012") < 0)
+               fprintf (fprcs, "next     ;\012") < 0 ||
+               fprintf (fprcs, "commitid        %s;\012", global_session_id) < 
0)
                goto write_error;
 
 #ifdef PRESERVE_PERMISSIONS_SUPPORT
Index: src/log.c
===================================================================
RCS file: /cvs/ccvs/src/log.c,v
retrieving revision 1.99
diff -u -r1.99 log.c
--- src/log.c   1 Feb 2005 21:43:48 -0000       1.99
+++ src/log.c   25 Feb 2005 01:36:06 -0000
@@ -1634,7 +1634,17 @@
        cvs_output_tagged ("text", padd->data);
        cvs_output_tagged ("text", " -");
        cvs_output_tagged ("text", pdel->data);
+        cvs_output_tagged ("text", ";");
     }
+
+    p = findnode(ver->other_delta,"commitid");
+    if(p && p->data)
+    {
+        cvs_output_tagged ("text", "  commitid: ");
+       cvs_output_tagged ("text", p->data);
+       cvs_output_tagged ("text", ";");
+    }
+
     cvs_output_tagged ("newline", NULL);
 
     if (ver->branches != NULL)
Index: src/main.c
===================================================================
RCS file: /cvs/ccvs/src/main.c,v
retrieving revision 1.239
diff -u -r1.239 main.c
--- src/main.c  23 Feb 2005 19:59:49 -0000      1.239
+++ src/main.c  25 Feb 2005 01:36:06 -0000
@@ -25,6 +25,8 @@
 const char *program_path;
 const char *cvs_cmd_name;
 
+char global_session_id[GLOBAL_SESSION_ID_LENGTH]; /* Random session ID */
+
 char *hostname;
 #ifdef SERVER_SUPPORT
 char *server_hostname;
@@ -678,6 +680,12 @@
 cause intermittent sandbox corruption.");
     }
 
+    /* Calculate the cvs global session ID */
+
+    
sprintf(global_session_id,"%x%08lx%04x",(int)getpid(),(long)time(NULL),rand()&0xFFFF);
+
+    TRACE(TRACE_FUNCTION,"Session ID is %s",global_session_id);
+
     /* Look up the command name. */
 
     cvs_cmd_name = argv[0];
Index: src/rcs.c
===================================================================
RCS file: /cvs/ccvs/src/rcs.c,v
retrieving revision 1.329
diff -u -r1.329 rcs.c
--- src/rcs.c   23 Feb 2005 01:24:28 -0000      1.329
+++ src/rcs.c   25 Feb 2005 01:36:10 -0000
@@ -4954,6 +4954,7 @@
 #ifdef PRESERVE_PERMISSIONS_SUPPORT
     struct stat sb;
 #endif
+    Node *np;
 
     commitpt = NULL;
 
@@ -5023,6 +5024,16 @@
     else
        delta->state = xstrdup ("Exp");
 
+    delta->other_delta = getlist();
+
+    /* save the commit ID */
+    np = getnode();
+    np->type = RCSFIELD;
+    np->key = xstrdup ("commitid");
+    np->data = xstrdup(global_session_id);
+    addnode (delta->other_delta, np);
+
+
 #ifdef PRESERVE_PERMISSIONS_SUPPORT
     /* If permissions should be preserved on this project, then
        save the permission info. */
Index: src/sanity.sh
===================================================================
RCS file: /cvs/ccvs/src/sanity.sh,v
retrieving revision 1.1046
diff -u -r1.1046 sanity.sh
--- src/sanity.sh       24 Feb 2005 22:22:17 -0000      1.1046
+++ src/sanity.sh       25 Feb 2005 01:36:23 -0000
@@ -457,6 +457,9 @@
 author="[-a-zA-Z0-9][-a-zA-Z0-9]*"
 hostname="[-_.a-zA-Z0-9]*"
 
+# Regexp to match a commitid
+commitid="[a-zA-Z0-9]*"
+
 # Regexp to match the name of a temporary file (from cvs_temp_name).
 # This appears in certain diff output.
 tempname="[-a-zA-Z0-9/.%_]*"
@@ -3069,15 +3072,15 @@
 description:
 ----------------------------
 revision 3\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}0 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}0 -0;  
commitid: ${commitid};
 bump-it
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
 modify-it
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 add-it
 
============================================================================="
          dotest basica-o8 "${testcvs} -q update -p -r 1.1 ./ssfile" "ssfile"
@@ -3561,6 +3564,7 @@
 
    Working revision:   1\.1.*
    Repository revision:        1\.1    ${CVSROOT_DIRNAME}/first-dir/file2,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)
@@ -3570,6 +3574,7 @@
 
    Working revision:   1\.1.*
    Repository revision:        1\.1    ${CVSROOT_DIRNAME}/first-dir/file3,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)
@@ -3579,6 +3584,7 @@
 
    Working revision:   1\.1.*
    Repository revision:        1\.1    ${CVSROOT_DIRNAME}/first-dir/file4,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)
@@ -3588,6 +3594,7 @@
 
    Working revision:   1\.1.*
    Repository revision:        1\.1    ${CVSROOT_DIRNAME}/first-dir/file5,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -3646,6 +3653,7 @@
 
    Working revision:   -1\.1.*
    Repository revision:        1\.1    ${CVSROOT_DIRNAME}/first-dir/file2,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)
@@ -3655,6 +3663,7 @@
 
    Working revision:   -1\.1.*
    Repository revision:        1\.1    ${CVSROOT_DIRNAME}/first-dir/file3,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)
@@ -3664,6 +3673,7 @@
 
    Working revision:   -1\.1.*
    Repository revision:        1\.1    ${CVSROOT_DIRNAME}/first-dir/file4,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)
@@ -3673,6 +3683,7 @@
 
    Working revision:   -1\.1.*
    Repository revision:        1\.1    ${CVSROOT_DIRNAME}/first-dir/file5,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -4072,7 +4083,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 second dive
 =============================================================================
 
@@ -4089,7 +4100,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 second dive
 =============================================================================
 ${SPROG} log: Logging first-dir/dir1
@@ -4108,7 +4119,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 second dive
 =============================================================================
 
@@ -4125,7 +4136,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 second dive
 =============================================================================
 ${SPROG} log: Logging first-dir/dir1/dir2
@@ -4144,7 +4155,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 second dive
 =============================================================================
 
@@ -4161,7 +4172,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 second dive
 
============================================================================="
 
@@ -4181,6 +4192,7 @@
 
    Working revision:   1\.1.*
    Repository revision:        1\.1    ${CVSROOT_DIRNAME}/first-dir/file6,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)
@@ -4190,6 +4202,7 @@
 
    Working revision:   -1\.1.*
    Repository revision:        1\.1    ${CVSROOT_DIRNAME}/first-dir/file7,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)
@@ -4209,6 +4222,7 @@
 
    Working revision:   1\.1.*
    Repository revision:        1\.1    
${CVSROOT_DIRNAME}/first-dir/dir1/file6,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)
@@ -4218,6 +4232,7 @@
 
    Working revision:   -1\.1.*
    Repository revision:        1\.1    
${CVSROOT_DIRNAME}/first-dir/dir1/file7,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)
@@ -4237,6 +4252,7 @@
 
    Working revision:   1\.1.*
    Repository revision:        1\.1    
${CVSROOT_DIRNAME}/first-dir/dir1/dir2/file6,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)
@@ -4246,6 +4262,7 @@
 
    Working revision:   -1\.1.*
    Repository revision:        1\.1    
${CVSROOT_DIRNAME}/first-dir/dir1/dir2/file7,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)${DOTSTAR}"
@@ -5184,6 +5201,7 @@
 
    Working revision:   1\.2.*
    Repository revision:        1\.2    ${CVSROOT_DIRNAME}/first-dir/tfile,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -5197,6 +5215,7 @@
 
    Working revision:   1\.2.*
    Repository revision:        1\.2    ${CVSROOT_DIRNAME}/first-dir/tfile,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -5209,6 +5228,7 @@
 
    Working revision:   1\.2.*
    Repository revision:        1\.2    ${CVSROOT_DIRNAME}/first-dir/tfile,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -5222,6 +5242,7 @@
 
    Working revision:   1\.2.*
    Repository revision:        1\.2    ${CVSROOT_DIRNAME}/first-dir/tfile,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -5264,6 +5285,7 @@
 
    Working revision:   1\.2.*
    Repository revision:        1\.2    $CVSROOT_DIRNAME/first-dir/tfile,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -5273,6 +5295,7 @@
 
    Working revision:   1\.1.*
    Repository revision:        1\.1    $CVSROOT_DIRNAME/fourth-dir/t3file,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -5381,6 +5404,7 @@
 
    Working revision:   1\.2.*
    Repository revision:        1\.2    ${CVSROOT_DIRNAME}/trdiff/foo,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     -ko
@@ -6674,6 +6698,7 @@
 
    Working revision:   8\.4.*
    Repository revision:        8\.4    ${CVSROOT_DIRNAME}/first-dir/file5,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         8\.4
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -6804,6 +6829,7 @@
 
    Working revision:   No entry for file1
    Repository revision:        1\.6    
${CVSROOT_DIRNAME}/first-dir/Attic/file1,v
+   Commit Identifier:  ${commitid}
 
    Existing Tags:
        tagone                          (revision: 1.1)"
@@ -7273,29 +7299,29 @@
 description:
 ----------------------------
 revision 1\.3
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1;  
commitid: ${commitid};
 trunk-change-after-branch
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1;  
commitid: ${commitid};
 branches:  1\.2\.2;
 trunk-before-branch
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 add-it
 ----------------------------
 revision 1\.2\.2\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1;  
commitid: ${commitid};
 change-on-br1
 ----------------------------
 revision 1\.2\.2\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1;  
commitid: ${commitid};
 branches:  1\.2\.2\.1\.2;
 modify
 ----------------------------
 revision 1\.2\.2\.1\.2\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1;  
commitid: ${commitid};
 modify
 
============================================================================="
          dotest_fail branches-14.4 \
@@ -7428,6 +7454,7 @@
 
    Working revision:   1\.1.*
    Repository revision:        1\.1    ${CVSROOT_DIRNAME}/first-dir/file1,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         b2 (branch: 1\.1\.4)
    Sticky Date:                (none)
    Sticky Options:     (none)
@@ -7437,6 +7464,7 @@
 
    Working revision:   1\.1\.2\.1.*
    Repository revision:        1\.1\.2\.1      
${CVSROOT_DIRNAME}/first-dir/dir1/Attic/file3,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         b1 (branch: 1\.1\.2)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -7659,6 +7687,7 @@
 
    Working revision:   1\.1.*
    Repository revision:        1\.1    ${CVSROOT_DIRNAME}/first-dir/file1,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         b2 (branch: 1\.1\.4)
    Sticky Date:                (none)
    Sticky Options:     (none)
@@ -7685,6 +7714,7 @@
 
    Working revision:   1\.1.*
    Repository revision:        1\.1    ${CVSROOT_DIRNAME}/first-dir/file1,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)
@@ -7694,6 +7724,7 @@
 
    Working revision:   1\.1\.2\.1.*
    Repository revision:        1\.1\.2\.1      
${CVSROOT_DIRNAME}/first-dir/dir1/Attic/file3,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         b1 (branch: 1\.1\.2)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -7708,6 +7739,7 @@
 
    Working revision:   1\.1.*
    Repository revision:        1\.1    ${CVSROOT_DIRNAME}/first-dir/file1,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)
@@ -7717,6 +7749,7 @@
 
    Working revision:   New file!
    Repository revision:        1\.1    
${CVSROOT_DIRNAME}/first-dir/dir1/Attic/file3,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -7763,6 +7796,7 @@
 
    Working revision:   1\.1\.2\.1.*
    Repository revision:        1\.1\.2\.1      
${CVSROOT_DIRNAME}/first-dir/dir2/Attic/file4,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         b1 (branch: 1\.1\.2)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -7795,6 +7829,7 @@
 
    Working revision:   1\.1.*
    Repository revision:        1\.1    
${CVSROOT_DIRNAME}/first-dir/dir2/file5,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -7866,7 +7901,7 @@
 description:
 ----------------------------
 revision 1.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 add
 
============================================================================="
 
@@ -8174,6 +8209,7 @@
 
    Working revision:   1\.1\.2\.1.*
    Repository revision:        1\.1\.2\.1      
${CVSROOT_DIRNAME}/first-dir/file1,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         br (revision: 1\.1\.2\.1)
    Sticky Date:                (none)
    Sticky Options:     (none)
@@ -8632,6 +8668,7 @@
 
    Working revision:   1\.1.*
    Repository revision:        1\.1    ${CVSROOT_DIRNAME}/first-dir/file1,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         patch1 (branch: 1\.1\.2)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -8886,16 +8923,16 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 branches:  1\.1\.2;  1\.1\.4;
 add-it
 ----------------------------
 revision 1\.1\.4\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
 modify-on-br2
 ----------------------------
 revision 1\.1\.2\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1;  
commitid: ${commitid};
 modify-on-br1
 
============================================================================="
 
@@ -9005,16 +9042,16 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: dead;  lines: ${PLUS}0 -0
+date: ${ISO8601DATE};  author: ${username};  state: dead;  lines: ${PLUS}0 
-0;  commitid: ${commitid};
 local-changes
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 branches:  1\.1\.1;
 Initial revision
 ----------------------------
 revision 1\.1\.1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}0 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}0 -0;  
commitid: ${commitid};
 first-import
 
============================================================================="
 
@@ -9219,16 +9256,16 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 branches:  1\.1\.1;  1\.1\.3;
 Initial revision
 ----------------------------
 revision 1\.1\.3\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1;  
commitid: ${commitid};
 add
 ----------------------------
 revision 1\.1\.1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}0 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}0 -0;  
commitid: ${commitid};
 add
 
============================================================================="
 
@@ -9319,17 +9356,17 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE2034};  author: ${username};  state: Exp;
+date: ${ISO8601DATE2034};  author: ${username};  state: Exp;  commitid: 
${commitid};
 branches:  1\.1\.1;
 Initial revision
 ----------------------------
 revision 1\.1\.1\.1
-date: ${ISO8601DATE2034};  author: ${username};  state: Exp;  lines: ${PLUS}0 
-0
+date: ${ISO8601DATE2034};  author: ${username};  state: Exp;  lines: ${PLUS}0 
-0;  commitid: ${commitid};
 branches:  1\.1\.1\.1\.2;
 import-it
 ----------------------------
 revision 1\.1\.1\.1\.2\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
 modify
 
============================================================================="
 
@@ -9349,12 +9386,12 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE1971};  author: ${username};  state: Exp;
+date: ${ISO8601DATE1971};  author: ${username};  state: Exp;  commitid: 
${commitid};
 branches:  1\.1\.1;
 Initial revision
 ----------------------------
 revision 1\.1\.1\.1
-date: ${ISO8601DATE1971};  author: ${username};  state: Exp;  lines: ${PLUS}0 
-0
+date: ${ISO8601DATE1971};  author: ${username};  state: Exp;  lines: ${PLUS}0 
-0;  commitid: ${commitid};
 import-it
 
============================================================================="
          cd ..
@@ -9468,16 +9505,16 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 branches:  1\.1\.1;
 Initial revision
 ----------------------------
 revision 1\.1\.1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1;  
commitid: ${commitid};
 add
 ----------------------------
 revision 1\.1\.1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}0 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}0 -0;  
commitid: ${commitid};
 add
 
============================================================================="
 
@@ -9497,20 +9534,20 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: dead;  lines: ${PLUS}0 -0
+date: ${ISO8601DATE};  author: ${username};  state: dead;  lines: ${PLUS}0 
-0;  commitid: ${commitid};
 Revision 1\.1 was added on the vendor branch\.
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 branches:  1\.1\.1;
 Initial revision
 ----------------------------
 revision 1\.1\.1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1;  
commitid: ${commitid};
 add
 ----------------------------
 revision 1\.1\.1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}0 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}0 -0;  
commitid: ${commitid};
 add
 
============================================================================="
 
@@ -9578,16 +9615,16 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: dead;  lines: ${PLUS}0 -0
+date: ${ISO8601DATE};  author: ${username};  state: dead;  lines: ${PLUS}0 
-0;  commitid: ${commitid};
 Revision 1\.1 was added on the vendor branch\.
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 branches:  1\.1\.1;
 Initial revision
 ----------------------------
 revision 1\.1\.1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}0 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}0 -0;  
commitid: ${commitid};
 add
 
============================================================================="
 
@@ -10337,6 +10374,7 @@
 
    Working revision:   1\.1.*
    Repository revision:        1\.1    ${CVSROOT_DIRNAME}/first-dir/file1,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -10356,6 +10394,7 @@
 
    Working revision:   1\.1.*
    Repository revision:        1\.1    ${CVSROOT_DIRNAME}/first-dir/file1,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -10389,6 +10428,7 @@
 
    Working revision:   New file!
    Repository revision:        1\.1    
${CVSROOT_DIRNAME}/first-dir/Attic/bradd,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -11082,6 +11122,7 @@
 
    Working revision:   1\.1.*
    Repository revision:        1\.1    ${CVSROOT_DIRNAME}/x/b,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -11228,16 +11269,16 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: $username;  state: dead;  lines: ${PLUS}0 -0
+date: ${ISO8601DATE};  author: $username;  state: dead;  lines: ${PLUS}0 -0;  
commitid: ${commitid};
 save the merge
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: $username;  state: Exp;
+date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: 
${commitid};
 branches:  1.1.2;
 add-em
 ----------------------------
 revision 1\.1\.2\.1
-date: ${ISO8601DATE};  author: $username;  state: dead;  lines: ${PLUS}0 -0
+date: ${ISO8601DATE};  author: $username;  state: dead;  lines: ${PLUS}0 -0;  
commitid: ${commitid};
 rm
 
============================================================================="
 
@@ -11259,6 +11300,7 @@
 
    Working revision:   1\.1.*
    Repository revision:        1\.1    $CVSROOT_DIRNAME/join-rm/a,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -11360,6 +11402,7 @@
 
    Working revision:   1\.1.*
    Repository revision:        1\.1\.2\.1      ${CVSROOT_DIRNAME}/first-dir/a,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         branch (branch: 1\.1\.2)
    Sticky Date:                (none)
    Sticky Options:     (none)${DOTSTAR}"
@@ -11453,6 +11496,7 @@
 
    Working revision:   1\.1.*
    Repository revision:        1\.2    ${CVSROOT_DIRNAME}/first-dir/a,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -11491,6 +11535,7 @@
 
    Working revision:   1\.2.*
    Repository revision:        1\.2    ${CVSROOT_DIRNAME}/first-dir/a,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -11521,6 +11566,7 @@
 
    Working revision:   1\.2.*
    Repository revision:        1\.2    ${CVSROOT_DIRNAME}/first-dir/a,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -11538,6 +11584,7 @@
 
    Working revision:   1\.3.*
    Repository revision:        1\.3    ${CVSROOT_DIRNAME}/first-dir/a,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -11550,6 +11597,7 @@
 
    Working revision:   1\.4.*
    Repository revision:        1\.4    ${CVSROOT_DIRNAME}/first-dir/a,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -11669,6 +11717,7 @@
 
    Working revision:   1\.1.*
    Repository revision:        1\.2    $CVSROOT_DIRNAME/first-dir/a,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -11790,7 +11839,8 @@
 File: aa\.c                    Status: Unresolved Conflict
 
    Working revision:   No entry for aa\.c
-   Repository revision:        1\.1    ${CVSROOT_DIRNAME}/first-dir/aa\.c,v"
+   Repository revision:        1\.1    ${CVSROOT_DIRNAME}/first-dir/aa\.c,v
+   Commit Identifier:  ${commitid}"
          dotest conflicts2-142d3a "${testcvs} -q status bb.c" \
 "${SPROG} status: conflict: \`bb\.c' created independently by second party
 ===================================================================
@@ -11798,6 +11848,7 @@
 
    Working revision:   New file!
    Repository revision:        1\.1    ${CVSROOT_DIRNAME}/first-dir/bb\.c,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -13138,7 +13189,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 add-it
 
============================================================================="
 
@@ -15640,7 +15691,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 branches:  1\.1\.2;
 xCVS: ----------------------------------------------------------------------
 xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
@@ -15652,7 +15703,7 @@
 xCVS: ----------------------------------------------------------------------
 ----------------------------
 revision 1\.1\.2\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
 xCVS: ----------------------------------------------------------------------
 xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
 xCVS:
@@ -15678,7 +15729,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 branches:  1\.1\.2;
 xCVS: ----------------------------------------------------------------------
 xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
@@ -15690,7 +15741,7 @@
 xCVS: ----------------------------------------------------------------------
 ----------------------------
 revision 1\.1\.2\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
 xCVS: ----------------------------------------------------------------------
 xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
 xCVS:
@@ -15710,7 +15761,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 branches:  1\.1\.2;
 xCVS: ----------------------------------------------------------------------
 xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
@@ -15722,7 +15773,7 @@
 xCVS: ----------------------------------------------------------------------
 ----------------------------
 revision 1\.1\.2\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
 xCVS: ----------------------------------------------------------------------
 xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
 xCVS:
@@ -15878,7 +15929,7 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: +0 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: +0 -0;  
commitid: ${commitid};
 \*\*\* empty log message \*\*\*
 
============================================================================="
 
@@ -17465,6 +17516,7 @@
 
    Working revision:   1\.1.*
    Repository revision:        1\.1    ${CVSROOT_DIRNAME}/first-dir/binfile,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     -kb"
@@ -17483,6 +17535,7 @@
 
    Working revision:   1\.1.*
    Repository revision:        1\.1    ${CVSROOT_DIRNAME}/first-dir/binfile,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     -kb"
@@ -17502,6 +17555,7 @@
 
    Working revision:   1\.1.*
    Repository revision:        1\.1    ${CVSROOT_DIRNAME}/first-dir/binfile,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     -kb"
@@ -17518,6 +17572,7 @@
 
    Working revision:   1\.1.*
    Repository revision:        1\.1    ${CVSROOT_DIRNAME}/first-dir/binfile,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     -kb"
@@ -17577,6 +17632,7 @@
 
    Working revision:   1\.4.*
    Repository revision:        1\.4    ${CVSROOT_DIRNAME}/first-dir/binfile,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         HEAD (revision: 1\.4)
    Sticky Date:                (none)
    Sticky Options:     -kb"
@@ -17596,6 +17652,7 @@
 
    Working revision:   1\.5.*
    Repository revision:        1\.5    ${CVSROOT_DIRNAME}/first-dir/binfile,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     -kb"
@@ -17613,6 +17670,7 @@
 
    Working revision:   1\.5.*
    Repository revision:        1\.5    ${CVSROOT_DIRNAME}/first-dir/binfile,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     -kb"
@@ -17624,6 +17682,7 @@
 
    Working revision:   1\.5.*
    Repository revision:        1\.5    ${CVSROOT_DIRNAME}/first-dir/binfile,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     -kv"
@@ -17643,6 +17702,7 @@
 
    Working revision:   1\.1.*
    Repository revision:        1\.1    ${CVSROOT_DIRNAME}/first-dir/nibfile,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     -kb"
@@ -17656,6 +17716,7 @@
 
    Working revision:   1\.1.*
    Repository revision:        1\.1    ${CVSROOT_DIRNAME}/first-dir/nibfile,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -17669,6 +17730,7 @@
 
    Working revision:   1\.1.*
    Repository revision:        1\.1    ${CVSROOT_DIRNAME}/first-dir/nibfile,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     -kb"
@@ -17853,7 +17915,7 @@
 description:
 ----------------------------
 revision 1\.3
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 checkin
 
============================================================================="
 
@@ -18100,6 +18162,7 @@
 
    Working revision:   1\.1\.1\.1.*
    Repository revision:        1\.1\.1\.1      
${CVSROOT_DIRNAME}/first-dir/foo\.c,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)
@@ -18109,6 +18172,7 @@
 
    Working revision:   1\.1\.1\.1.*
    Repository revision:        1\.1\.1\.1      
${CVSROOT_DIRNAME}/first-dir/foo\.exe,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     -kb"
@@ -18149,6 +18213,7 @@
 
    Working revision:   1\.1\.1\.1.*
    Repository revision:        1\.1\.1\.1      
${CVSROOT_DIRNAME}/first-dir/foo\.c,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     -ko
@@ -18158,6 +18223,7 @@
 
    Working revision:   1\.1\.1\.1.*
    Repository revision:        1\.1\.1\.1      
${CVSROOT_DIRNAME}/first-dir/foo\.exe,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     -kb"
@@ -19894,24 +19960,25 @@
          log_dash='----------------------------
 revision'
          log_date="date: ${ISO8601DATE};  author: ${username};  state: Exp;"
-         log_lines="  lines: ${PLUS}1 -1"
+         log_lines="  lines: ${PLUS}1 -1;"
+         log_commitid="  commitid: ${commitid};"
          log_rev1="${log_dash} 1\.1
-${log_date}
+${log_date}${log_commitid}
 line 1
 
 line 2"
          log_rev2="${log_dash} 1\.2
-${log_date}${log_lines}
+${log_date}${log_lines}${log_commitid}
 branches:  1\.2\.2;
 2"
          log_rev3="${log_dash} 1\.3
-${log_date}${log_lines}
+${log_date}${log_lines}${log_commitid}
 3"
          log_rev1b="${log_dash} 1\.2\.2\.1
-${log_date}${log_lines}
+${log_date}${log_lines}${log_commitid}
 1b"
          log_rev2b="${log_dash} 1\.2\.2\.2
-${log_date}${log_lines}
+${log_date}${log_lines}${log_commitid}
 2b"
          
log_trailer='============================================================================='
 
@@ -20527,10 +20594,10 @@
        tag2: 1\.3
        tag1: 1\.2'
          log_rev4="${log_dash} 1\.4
-date: ${ISO8601DATE};  author: ${username};  state: dead;  lines: ${PLUS}0 -0
+date: ${ISO8601DATE};  author: ${username};  state: dead;  lines: ${PLUS}0 
-0;  commitid: ${commitid};
 4"
          log_rev22="${log_dash} 1\.2
-${log_date}${log_lines}
+${log_date}${log_lines}${log_commitid}
 2"
 
          dotest log-d3 "${testcvs} log -rbranch file1" \
@@ -20882,7 +20949,7 @@
 file1-is-for-testing
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 1
 
============================================================================="
 
@@ -20904,7 +20971,7 @@
 change-description
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 1
 
============================================================================="
 
@@ -20929,7 +20996,7 @@
 with two lines
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 1
 
============================================================================="
 
@@ -20952,7 +21019,7 @@
 change from stdin
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 1
 
============================================================================="
 
@@ -21545,11 +21612,11 @@
 file1 is for testing CVS
 ----------------------------
 revision 1\.3
-date: ${ISO8601DATE2000A};  author: kingdon;  state: Exp;  lines: ${PLUS}1 -2
+date: ${ISO8601DATE2000A};  author: kingdon;  state: Exp;  lines: ${PLUS}1 
-2;
 delete second line; modify twelfth line
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE1996A};  author: kingdon;  state: Exp;  lines: ${PLUS}12 
-0
+date: ${ISO8601DATE1996A};  author: kingdon;  state: Exp;  lines: ${PLUS}12 
-0;
 add more lines
 ----------------------------
 revision 1\.1
@@ -21579,7 +21646,7 @@
 file1 is for testing CVS
 ----------------------------
 revision 1\.3
-date: ${ISO8601DATE2000A};  author: kingdon;  state: Exp;  lines: ${PLUS}1 -2
+date: ${ISO8601DATE2000A};  author: kingdon;  state: Exp;  lines: ${PLUS}1 
-2;
 delete second line; modify twelfth line
 
============================================================================="
 
@@ -21599,7 +21666,7 @@
 file1 is for testing CVS
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE1996A};  author: kingdon;  state: Exp;  lines: ${PLUS}12 
-0
+date: ${ISO8601DATE1996A};  author: kingdon;  state: Exp;  lines: ${PLUS}12 
-0;
 add more lines
 ----------------------------
 revision 1\.1
@@ -21740,6 +21807,7 @@
 date   [0-9.]*;        author ${username};     state Exp;
 branches;
 next   ;
+commitid       ${commitid};
 
 
 desc
@@ -21843,19 +21911,19 @@
 description:
 ----------------------------
 revision 1\.5
-date: 1971-01-01 01:00:00 [+-]0000;  author: joe;  state: bogus;  lines: 
${PLUS}1 -1
+date: 1971-01-01 01:00:00 [+-]0000;  author: joe;  state: bogus;  lines: 
${PLUS}1 -1;
 \*\*\* empty log message \*\*\*
 ----------------------------
 revision 1\.4
-date: 1971-01-01 00:00:05 [+-]0000;  author: joe;  state: bogus;  lines: 
${PLUS}1 -1
+date: 1971-01-01 00:00:05 [+-]0000;  author: joe;  state: bogus;  lines: 
${PLUS}1 -1;
 \*\*\* empty log message \*\*\*
 ----------------------------
 revision 1\.3
-date: 1970-12-31 15:00:05 [+-]0000;  author: joe;  state: bogus;  lines: 
${PLUS}1 -1
+date: 1970-12-31 15:00:05 [+-]0000;  author: joe;  state: bogus;  lines: 
${PLUS}1 -1;
 \*\*\* empty log message \*\*\*
 ----------------------------
 revision 1\.2
-date: 1970-12-31 12:15:05 [+-]0000;  author: me;  state: bogus;  lines: 
${PLUS}1 -1
+date: 1970-12-31 12:15:05 [+-]0000;  author: me;  state: bogus;  lines: 
${PLUS}1 -1;
 branches:  1\.2\.6;
 \*\*\* empty log message \*\*\*
 ----------------------------
@@ -21864,11 +21932,11 @@
 \*\*\* empty log message \*\*\*
 ----------------------------
 revision 1\.2\.6\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1;  
commitid: ${commitid};
 mod
 ----------------------------
 revision 1\.2\.6\.1
-date: 1971-01-01 08:00:05 [+-]0000;  author: joe;  state: Exp;  lines: 
${PLUS}1 -1
+date: 1971-01-01 08:00:05 [+-]0000;  author: joe;  state: Exp;  lines: 
${PLUS}1 -1;
 \*\*\* empty log message \*\*\*
 
============================================================================="
          # Now test each date format for "cvs log -d".
@@ -22155,6 +22223,7 @@
 
    Working revision:   1\.1\.1\.1.*
    Repository revision:        1\.1\.1\.1      
'${CVSROOT_DIRNAME}'/rcs4-dir/file1,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                2001\.10\.01\.00\.00\.00
    Sticky Options:     (none)'
@@ -24866,6 +24935,7 @@
 
    Working revision:   1\.1[^.]*
    Repository revision:        1\.1    ${CVSROOT_DIRNAME}/first-dir/file1,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                ${RCSDELTADATE}
    Sticky Options:     (none)"
@@ -24877,6 +24947,7 @@
 
    Working revision:   1\.1[^.]*
    Repository revision:        1\.1\.4\.2      
${CVSROOT_DIRNAME}/first-dir/file1,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         br2 (branch: 1\.1\.4)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -24888,6 +24959,7 @@
 
    Working revision:   1\.2[^.]*
    Repository revision:        1\.2    ${CVSROOT_DIRNAME}/first-dir/file1,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                ${RCSDELTADATE}
    Sticky Options:     (none)"
@@ -24899,6 +24971,7 @@
 
    Working revision:   1\.1[^.]*
    Repository revision:        1\.1\.4\.2      
${CVSROOT_DIRNAME}/first-dir/file1,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         br2 (branch: 1\.1\.4)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -24910,6 +24983,7 @@
 
    Working revision:   1\.1\.4\.1[^.]*
    Repository revision:        1\.1\.4\.2      
${CVSROOT_DIRNAME}/first-dir/file1,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         br2 (branch: 1\.1\.4)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -24921,6 +24995,7 @@
 
    Working revision:   1\.1\.4\.2[^.]*
    Repository revision:        1\.1\.4\.2      
${CVSROOT_DIRNAME}/first-dir/file1,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         br2 (branch: 1\.1\.4)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -24932,6 +25007,7 @@
 
    Working revision:   1\.1\.4\.2[^.]*
    Repository revision:        1\.1\.4\.2      
${CVSROOT_DIRNAME}/first-dir/file1,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         br2 (branch: 1\.1\.4)
    Sticky Date:                (none)
    Sticky Options:     (none)
@@ -24941,6 +25017,7 @@
 
    Working revision:   1\.1\.2\.1[^.]*
    Repository revision:        1\.1\.2\.1      
${CVSROOT_DIRNAME}/first-dir/Attic/file3,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         br2 (branch: 1\.1\.2)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -24952,6 +25029,7 @@
 
    Working revision:   1\.2[^.]*
    Repository revision:        1\.2    ${CVSROOT_DIRNAME}/first-dir/file1,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                ${RCSDELTADATE}
    Sticky Options:     (none)
@@ -24961,6 +25039,7 @@
 
    Working revision:   1\.1[^.]*
    Repository revision:        1\.1    ${CVSROOT_DIRNAME}/first-dir/file2,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                ${RCSDELTADATE}
    Sticky Options:     (none)"
@@ -24972,6 +25051,7 @@
 
    Working revision:   1\.1\.4\.2[^.]*
    Repository revision:        1\.1\.4\.2      
${CVSROOT_DIRNAME}/first-dir/file1,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         br2 (branch: 1\.1\.4)
    Sticky Date:                (none)
    Sticky Options:     (none)
@@ -24981,6 +25061,7 @@
 
    Working revision:   1\.1\.2\.1[^.]*
    Repository revision:        1\.1\.2\.1      
${CVSROOT_DIRNAME}/first-dir/Attic/file3,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         br2 (branch: 1\.1\.2)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -24992,6 +25073,7 @@
 
    Working revision:   1\.2[^.]*
    Repository revision:        1\.2    ${CVSROOT_DIRNAME}/first-dir/file1,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                ${RCSDELTADATE}
    Sticky Options:     (none)
@@ -25001,6 +25083,7 @@
 
    Working revision:   1\.2[^.]*
    Repository revision:        1\.2    ${CVSROOT_DIRNAME}/first-dir/file2,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                ${RCSDELTADATE}
    Sticky Options:     (none)"
@@ -25012,6 +25095,7 @@
 
    Working revision:   1\.1\.4\.2[^.]*
    Repository revision:        1\.1\.4\.2      
${CVSROOT_DIRNAME}/first-dir/file1,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         br2 (branch: 1\.1\.4)
    Sticky Date:                (none)
    Sticky Options:     (none)
@@ -25021,6 +25105,7 @@
 
    Working revision:   1\.1\.2\.1[^.]*
    Repository revision:        1\.1\.2\.1      
${CVSROOT_DIRNAME}/first-dir/Attic/file3,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         br2 (branch: 1\.1\.2)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -25032,6 +25117,7 @@
 
    Working revision:   1\.1\.4\.2[^.]*
    Repository revision:        1\.1\.4\.2      
${CVSROOT_DIRNAME}/first-dir/file1,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         br2 (branch: 1\.1\.4)
    Sticky Date:                (none)
    Sticky Options:     (none)
@@ -25041,6 +25127,7 @@
 
    Working revision:   1\.2\.2\.2[^.]*
    Repository revision:        1\.2\.2\.2      
${CVSROOT_DIRNAME}/first-dir/file2,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         br2 (branch: 1\.2\.2)
    Sticky Date:                (none)
    Sticky Options:     (none)
@@ -25050,6 +25137,7 @@
 
    Working revision:   1\.1\.2\.1[^.]*
    Repository revision:        1\.1\.2\.1      
${CVSROOT_DIRNAME}/first-dir/Attic/file3,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         br2 (branch: 1\.1\.2)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -25148,16 +25236,16 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: $username;  state: Exp;
+date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: 
${commitid};
 branches:  1\.1\.2;  1\.1\.4;
 add
 ----------------------------
 revision 1\.1\.4\.1
-date: ${ISO8601DATE};  author: $username;  state: Exp;  lines: ${PLUS}1 -1
+date: ${ISO8601DATE};  author: $username;  state: Exp;  lines: ${PLUS}1 -1;  
commitid: ${commitid};
 modify-on-B
 ----------------------------
 revision 1\.1\.2\.1
-date: ${ISO8601DATE};  author: $username;  state: Exp;  lines: ${PLUS}1 -1
+date: ${ISO8601DATE};  author: $username;  state: Exp;  lines: ${PLUS}1 -1;  
commitid: ${commitid};
 modify-on-A
 
============================================================================="
 
@@ -25178,7 +25266,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: $username;  state: Exp;
+date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: 
${commitid};
 branches:  1\.1\.2;  1\.1\.4;
 add
 
============================================================================="
@@ -25427,12 +25515,12 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 branches:  1\.1\.2;
 add
 ----------------------------
 revision 1\.1\.2\.1
-date: ${ISO8601DATE};  author: ${username};  state: foo;  lines: ${PLUS}1 -0
+date: ${ISO8601DATE};  author: ${username};  state: foo;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
 modify-on-branch
 
============================================================================="
          dotest admin-12 "${testcvs} -q admin -bbr file1" \
@@ -25453,12 +25541,12 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 branches:  1\.1\.2;
 add
 ----------------------------
 revision 1\.1\.2\.1
-date: ${ISO8601DATE};  author: ${username};  state: foo;  lines: ${PLUS}1 -0
+date: ${ISO8601DATE};  author: ${username};  state: foo;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
 modify-on-branch
 
============================================================================="
 
@@ -25491,11 +25579,13 @@
 branches
        1\.1\.2\.1;
 next   ;
+commitid       ${commitid};
 
 1\.1\.2\.1
 date   ${RCSDELTADATE};        author ${username};     state foo;
 branches;
 next   ;
+commitid       ${commitid};
 
 
 desc
@@ -25537,7 +25627,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 add
 
============================================================================="
 
@@ -25563,7 +25653,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: oneone;
+date: ${ISO8601DATE};  author: ${username};  state: oneone;  commitid: 
${commitid};
 changed-log-message
 
============================================================================="
 
@@ -25590,12 +25680,12 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 branches:  1\.1\.2;
 add
 ----------------------------
 revision 1\.1\.2\.1
-date: ${ISO8601DATE};  author: ${username};  state: foo;  lines: ${PLUS}1 -0
+date: ${ISO8601DATE};  author: ${username};  state: foo;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
 modify-on-branch
 
============================================================================="
 
@@ -25621,12 +25711,12 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 branches:  1\.1\.2;
 add
 ----------------------------
 revision 1.1.2.1
-date: ${ISO8601DATE};  author: ${username};  state: foo;  lines: ${PLUS}1 -0
+date: ${ISO8601DATE};  author: ${username};  state: foo;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
 modify-on-branch
 
============================================================================="
 
@@ -25741,7 +25831,7 @@
 description:
 ----------------------------
 revision 1\.6  locked by: ${username};
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
 sixth
 
============================================================================="
          dotest_fail admin-22-o10 "${testcvs} admin -o1.5: aaa" \
@@ -25770,19 +25860,19 @@
 description:
 ----------------------------
 revision 1\.4
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
 fourth
 ----------------------------
 revision 1\.3
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
 third
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
 second
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 first
 
============================================================================="
 
@@ -25839,24 +25929,24 @@
 description:
 ----------------------------
 revision 1\.4
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
 fourth
 ----------------------------
 revision 1\.3
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
 branches:  1\.3\.2;
 third
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
 second
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 first
 ----------------------------
 revision 1\.3\.2\.4
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}4 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}4 -0;  
commitid: ${commitid};
 branch-four
 
============================================================================="
 
@@ -25891,7 +25981,7 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 modify
 
============================================================================="
 
@@ -25910,11 +26000,13 @@
 branches
        1\.1\.2\.1;
 next   ;
+commitid       ${commitid};
 
 1\.1\.2\.1
 date   ${RCSDELTADATE};        author ${username};     state foo;
 branches;
 next   ;
+commitid       ${commitid};
 
 
 desc
@@ -25977,6 +26069,7 @@
 
    Working revision:   1\.2.*
    Repository revision:        1\.2    ${CVSROOT_DIRNAME}/first-dir/file2,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)
@@ -26082,16 +26175,19 @@
 date   ${RCSDELTADATE};        author ${username};     state Exp;
 branches;
 next   1\.3;
+commitid       ${commitid};
 
 1\.3
 date   ${RCSDELTADATE};        author ${username};     state Exp;
 branches;
 next   1\.2;
+commitid       ${commitid};
 
 1\.2
 date   ${RCSDELTADATE};        author ${username};     state Exp;
 branches;
 next   ;
+commitid       ${commitid};
 
 
 desc
@@ -26152,24 +26248,24 @@
 description:
 ----------------------------
 revision 1\.4
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
 fourth
 ----------------------------
 revision 1\.3
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
 branches:  1\.3\.2;
 third
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
 second
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 first
 ----------------------------
 revision 1\.3\.2\.4
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}4 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}4 -0;  
commitid: ${commitid};
 branch-four
 =============================================================================
 
@@ -26189,12 +26285,12 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 branches:  1\.1\.2;
 add
 ----------------------------
 revision 1\.1\.2\.1
-date: ${ISO8601DATE};  author: ${username};  state: foo;  lines: ${PLUS}1 -0
+date: ${ISO8601DATE};  author: ${username};  state: foo;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
 modify-on-branch
 =============================================================================
 
@@ -26221,15 +26317,15 @@
 description:
 ----------------------------
 revision 1\.4
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
 yet_another
 ----------------------------
 revision 1\.3
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
 nuthr_line
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 modify
 =============================================================================
 
@@ -26246,12 +26342,12 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: dead;
+date: ${ISO8601DATE};  author: ${username};  state: dead;  commitid: 
${commitid};
 branches:  1\.1\.2;
 file file3 was initially added on branch br\.
 ----------------------------
 revision 1\.1\.2\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
 another-log-message
 
============================================================================="
 
@@ -26315,7 +26411,7 @@
 description:
 ----------------------------
 revision 1\.1  locked by: ${username};
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 add
 
============================================================================="
 
@@ -26338,7 +26434,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 add
 
============================================================================="
 
@@ -27560,7 +27656,8 @@
 File: no file file             Status: Up-to-date
 
    Working revision:   No entry for file
-   Repository revision:        1\.2    $CVSROOT_DIRNAME/first-dir/Attic/file,v"
+   Repository revision:        1\.2    $CVSROOT_DIRNAME/first-dir/Attic/file,v
+   Commit Identifier:  ${commitid}"
              dotest recase-5sscs "$testcvs log file" \
 "
 RCS file: $CVSROOT_DIRNAME/first-dir/Attic/file,v
@@ -27576,11 +27673,11 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: $username;  state: dead;  lines: +0 -0
+date: ${ISO8601DATE};  author: $username;  state: dead;  lines: +0 -0;  
commitid: ${commitid};
 rm
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: $username;  state: Exp;
+date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: 
${commitid};
 add
 
============================================================================="
              dotest recase-6sscs "$testcvs status FiLe" \
@@ -27589,6 +27686,7 @@
 
    Working revision:   1\.1.*
    Repository revision:        1\.1    $CVSROOT_DIRNAME/first-dir/FiLe,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -27606,7 +27704,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: $username;  state: Exp;
+date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: 
${commitid};
 recase
 
============================================================================="
            else # server sensitive && client insensitive
@@ -27617,6 +27715,7 @@
 
    Working revision:   1\.1.*
    Repository revision:        1\.1    $CVSROOT_DIRNAME/first-dir/FiLe,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -27634,7 +27733,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: $username;  state: Exp;
+date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: 
${commitid};
 recase
 
============================================================================="
              dotest recase-6ss "$testcvs status FiLe" \
@@ -27643,6 +27742,7 @@
 
    Working revision:   1\.1.*
    Repository revision:        1\.1    $CVSROOT_DIRNAME/first-dir/FiLe,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -27660,7 +27760,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: $username;  state: Exp;
+date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: 
${commitid};
 recase
 
============================================================================="
            fi
@@ -27673,6 +27773,7 @@
 
    Working revision:   1\.3.*
    Repository revision:        1\.3    $CVSROOT_DIRNAME/first-dir/$file,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -27691,15 +27792,15 @@
 description:
 ----------------------------
 revision 1\.3
-date: ${ISO8601DATE};  author: $username;  state: Exp;  lines: +1 -1
+date: ${ISO8601DATE};  author: $username;  state: Exp;  lines: +1 -1;  
commitid: ${commitid};
 recase
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: $username;  state: dead;  lines: +0 -0
+date: ${ISO8601DATE};  author: $username;  state: dead;  lines: +0 -0;  
commitid: ${commitid};
 rm
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: $username;  state: Exp;
+date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: 
${commitid};
 add
 
============================================================================="
            dotest recase-6si "$testcvs status FiLe" \
@@ -27708,6 +27809,7 @@
 
    Working revision:   1\.3.*
    Repository revision:        1\.3    $CVSROOT_DIRNAME/first-dir/FiLe,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -27726,15 +27828,15 @@
 description:
 ----------------------------
 revision 1\.3
-date: ${ISO8601DATE};  author: $username;  state: Exp;  lines: +1 -1
+date: ${ISO8601DATE};  author: $username;  state: Exp;  lines: +1 -1;  
commitid: ${commitid};
 recase
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: $username;  state: dead;  lines: +0 -0
+date: ${ISO8601DATE};  author: $username;  state: dead;  lines: +0 -0;  
commitid: ${commitid};
 rm
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: $username;  state: Exp;
+date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: 
${commitid};
 add
 
============================================================================="
          fi
@@ -27756,6 +27858,7 @@
 
    Working revision:   1\.[0-9]*.*
    Repository revision:        1\.[0-9]*       
$CVSROOT_DIRNAME/first-dir/$fIlE,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -27821,7 +27924,8 @@
 File: no file file             Status: Up-to-date
 
    Working revision:   No entry for file
-   Repository revision:        1\.2    $CVSROOT_DIRNAME/first-dir/Attic/file,v"
+   Repository revision:        1\.2    $CVSROOT_DIRNAME/first-dir/Attic/file,v
+   Commit Identifier:  ${commitid}"
            dotest recase-14sscs "$testcvs log file" \
 "
 RCS file: $CVSROOT_DIRNAME/first-dir/Attic/file,v
@@ -27837,11 +27941,11 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: $username;  state: dead;  lines: +0 -0
+date: ${ISO8601DATE};  author: $username;  state: dead;  lines: +0 -0;  
commitid: ${commitid};
 rm
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: $username;  state: Exp;
+date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: 
${commitid};
 add
 
============================================================================="
            dotest recase-15sscs "$testcvs status FiLe" \
@@ -27850,6 +27954,7 @@
 
    Working revision:   1\.1.*
    Repository revision:        1\.1    $CVSROOT_DIRNAME/first-dir/FiLe,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -27867,7 +27972,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: $username;  state: Exp;
+date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: 
${commitid};
 recase
 
============================================================================="
              dotest recase-17sscs "$testcvs status FILE" \
@@ -27876,6 +27981,7 @@
 
    Working revision:   1.1.*
    Repository revision:        1.1     ${CVSROOT_DIRNAME}/first-dir/FILE,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -27893,7 +27999,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: $username;  state: Exp;
+date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: 
${commitid};
 recase
 
============================================================================="
            else # $server_sensitive && !$client_sensitive
@@ -27904,6 +28010,7 @@
 
    Working revision:   1\.1.*
    Repository revision:        1\.1    $CVSROOT_DIRNAME/first-dir/FiLe,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -27921,7 +28028,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: $username;  state: Exp;
+date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: 
${commitid};
 recase
 
============================================================================="
              dotest recase-17ssci "$testcvs status FILE" \
@@ -27930,6 +28037,7 @@
 
    Working revision:   1\.1.*
    Repository revision:        1\.1    $CVSROOT_DIRNAME/first-dir/FiLe,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -27947,7 +28055,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: $username;  state: Exp;
+date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: 
${commitid};
 recase
 
============================================================================="
            fi
@@ -27972,6 +28080,7 @@
 
    Working revision:   1\.[0-9]*.*
    Repository revision:        1\.[0-9]*       
$CVSROOT_DIRNAME/first-dir/$fIlE,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)"
@@ -28375,6 +28484,7 @@
 
    Working revision:   1\.2.*
    Repository revision:        1\.2    ${CVSROOT1_DIRNAME}/mod1-1/file1-1,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)
@@ -28388,6 +28498,7 @@
 
    Working revision:   1\.2.*
    Repository revision:        1\.2    ${CVSROOT1_DIRNAME}/mod1-2/file1-2,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)
@@ -28410,6 +28521,7 @@
 
    Working revision:   1\.2.*
    Repository revision:        1\.2    ${CVSROOT1_DIRNAME}/mod1-2/file1-2,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)
@@ -28432,6 +28544,7 @@
 
    Working revision:   1\.2.*
    Repository revision:        1\.2    ${CVSROOT2_DIRNAME}/mod2-2/file2-2,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)
@@ -28454,6 +28567,7 @@
 
    Working revision:   1\.2.*
    Repository revision:        1\.2    ${CVSROOT2_DIRNAME}/mod2-1/file2-1,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)
@@ -28467,6 +28581,7 @@
 
    Working revision:   1\.2.*
    Repository revision:        1\.2    ${CVSROOT2_DIRNAME}/mod2-2/file2-2,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)
@@ -28489,6 +28604,7 @@
 
    Working revision:   1\.2.*
    Repository revision:        1\.2    ${CVSROOT1_DIRNAME}/mod1-1/file1-1,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)
@@ -28502,6 +28618,7 @@
 
    Working revision:   1\.2.*
    Repository revision:        1\.2    ${CVSROOT1_DIRNAME}/mod1-2/file1-2,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)
@@ -28525,6 +28642,7 @@
 
    Working revision:   1\.2.*
    Repository revision:        1\.2    ${CVSROOT1_DIRNAME}/mod1-2/file1-2,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)
@@ -28548,6 +28666,7 @@
 
    Working revision:   1\.2.*
    Repository revision:        1\.2    ${CVSROOT2_DIRNAME}/mod2-2/file2-2,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)
@@ -28570,6 +28689,7 @@
 
    Working revision:   1\.2.*
    Repository revision:        1\.2    ${CVSROOT2_DIRNAME}/mod2-1/file2-1,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)
@@ -28583,6 +28703,7 @@
 
    Working revision:   1\.2.*
    Repository revision:        1\.2    ${CVSROOT2_DIRNAME}/mod2-2/file2-2,v
+   Commit Identifier:  ${commitid}
    Sticky Tag:         (none)
    Sticky Date:                (none)
    Sticky Options:     (none)
@@ -28645,7 +28766,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 reading
 =============================================================================
 
@@ -28662,11 +28783,11 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
 actually
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 is
 =============================================================================
 ${SPROG} log: Logging mod1-2
@@ -28683,7 +28804,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 reading
 =============================================================================
 
@@ -28700,11 +28821,11 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
 actually
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 is
 =============================================================================
 ${SPROG} log: Logging mod2-2/mod1-2
@@ -28721,7 +28842,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 reading
 =============================================================================
 
@@ -28738,11 +28859,11 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
 actually
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 is
 =============================================================================
 ${SPROG} log: Logging mod1-2/mod2-2
@@ -28759,7 +28880,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 reading
 =============================================================================
 
@@ -28776,11 +28897,11 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
 actually
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 anyone
 =============================================================================
 ${SPROG} log: Logging mod2-1
@@ -28797,7 +28918,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 reading
 =============================================================================
 
@@ -28814,11 +28935,11 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
 actually
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 anyone
 =============================================================================
 ${SPROG} log: Logging mod2-2
@@ -28835,7 +28956,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 reading
 =============================================================================
 
@@ -28852,11 +28973,11 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
 actually
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 anyone
 
=============================================================================" 
\
 "${SPROG} log: Logging \.
@@ -28874,7 +28995,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 reading
 =============================================================================
 
@@ -28891,11 +29012,11 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
 actually
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 is
 =============================================================================
 ${SPROG} log: Logging mod1-2
@@ -28912,7 +29033,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 reading
 =============================================================================
 
@@ -28929,11 +29050,11 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
 actually
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 is
 =============================================================================
 ${SPROG} log: Logging mod2-2
@@ -28951,7 +29072,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 reading
 =============================================================================
 
@@ -28968,11 +29089,11 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
 actually
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 is
 =============================================================================
 ${SPROG} log: Logging mod1-2
@@ -28990,7 +29111,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 reading
 =============================================================================
 
@@ -29007,11 +29128,11 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
 actually
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 anyone
 =============================================================================
 ${SPROG} log: Logging mod2-1
@@ -29028,7 +29149,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 reading
 =============================================================================
 
@@ -29045,11 +29166,11 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
 actually
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 anyone
 =============================================================================
 ${SPROG} log: Logging mod2-2
@@ -29066,7 +29187,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 reading
 =============================================================================
 
@@ -29083,11 +29204,11 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
 actually
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 anyone
 
============================================================================="
 
@@ -29181,7 +29302,8 @@
          # to work around).
          if $remote; then :; else
            dotest multiroot2-9a "${testcvs} -t update" \
-" *-> main loop with CVSROOT=${TESTDIR}/root1
+" *-> Session ID is ${commitid}
+ *-> main loop with CVSROOT=${TESTDIR}/root1
  *-> parse_config ($TESTDIR/root1)
  *-> do_update ((null), (null), (null), 1, 0, 0, 0, 0, 0, 3, (null), (null), 
(null), (null), (null), 1, (null))
  *-> Write_Template (\., ${TESTDIR}/root1)
@@ -33004,9 +33126,9 @@
 branches:  1\.1\.1;
 ${SPROG} log: Logging \.
 ${SPROG} log: Logging subdir
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}0 -0
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}0 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 description:
 description:
 head: 1\.1
@@ -33141,9 +33263,9 @@
 branches:  1\.1\.1;
 ${SPROG} log: Logging \.
 ${SPROG} log: Logging subdir
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}0 -0
-date: ${ISO8601DATE};  author: ${username};  state: Exp;
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}0 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
 description:
 description:
 head: 1\.1
Index: src/status.c
===================================================================
RCS file: /cvs/ccvs/src/status.c,v
retrieving revision 1.63
diff -u -r1.63 status.c
--- src/status.c        1 Feb 2005 22:20:07 -0000       1.63
+++ src/status.c        25 Feb 2005 01:36:23 -0000
@@ -125,6 +125,7 @@
     Ctype status;
     char *sstat;
     Vers_TS *vers;
+    Node *node;
 
     status = Classify_File (finfo, (char *) NULL, (char *) NULL, (char *) 
NULL,
                            1, 0, &vers, 0);
@@ -248,6 +249,20 @@
        cvs_output ("\t", 0);
        cvs_output (vers->srcfile->print_path, 0);
        cvs_output ("\n", 0);
+
+       node = findnode(vers->srcfile->versions,vers->vn_rcs);
+       if (node)
+       {
+           RCSVers *v;
+           v=(RCSVers*)node->data;
+           node = findnode(v->other_delta,"commitid");
+           cvs_output("   Commit Identifier:\t", 0);
+           if(node && node->data)
+               cvs_output(node->data, 0);
+           else
+               cvs_output("(none)",0);
+           cvs_output("\n",0);
+       }
     }
 
     if (vers->entdata)


Regards
Frank
- The LinCVS Team -
http:/www.lincvs.com





reply via email to

[Prev in Thread] Current Thread [Next in Thread]