[bug #15000] cvs status gets confused by "Result of merge" if there's no server

[anonymous]

URL:
  <http://savannah.nongnu.org/bugs/?func=detailitem&item_id=15000>

                 Summary: cvs status gets confused by "Result of merge" if
there's no server
                 Project: Concurrent Versions System
            Submitted by: None
            Submitted on: Fri 11/18/05 at 07:37
                Category: None
                Severity: 3 - Normal
              Item Group: None
                  Status: None
                 Privacy: Public
             Assigned to: None
             Open/Closed: Open
                 Release: 
           Fixed Release: None
   Fixed Feature Release: None

    _______________________________________________________

Details:

I'm running 1.12.12 (and have verified this in 1.12.13 as well.)
I recently ran cvs update on a file, such that the Entries file
has the following line:
  /extdbg.c/1.1.1.2/Result of merge/-kk/Tmxb_pager
However, when I do a "cvs status" on the file, status reports:

File: extdbg.c          Status: Locally Modified

   Working revision:    1.1.1.2 cvs status: Can't parse date/time: `Result of
merge UTC'.
Result of merge UTC
   Repository revision: 1.1.1.2 /proj/cvsroot/iim/extdbg.c,v
   Commit Identifier:   (none)
   Sticky Tag:          mxb_pager (branch: 1.1.1.2.24)
   Sticky Date:         (none)
   Sticky Options:      -kk

Note the output in the "Working revision:" line:
   cvs status: Can't parse date/time: `Result of merge UTC'.
followed by what CVS thinks is the date: `Result of merge UTC'.
(Needless to say, pcl-cvs gets *really* confused by this...)

This is printed by status.c, in the code:
      /* Only add the UTC timezone if there is a time to use. */
      if (!server_active && (strlen(vers->ts_rcs) > 0)

So, my situation is that there's no server active, and there's
something in the timestamp field.  Unfortunately, "Result of merge" is a
"special" timestamp.  I'm currently working around this by changing the
if-statement to:
   if (!server_active && (strlen(vers->ts_rcs) > 0) &&
            (strcmp(vers->ts_rcs, "Result of merge")))

I'm not completely sure why there's no timestamp following
"Result of merge" as (I believe) there was at one time. (Guess
it was removed for one reason or another.) 

Anyways, this gets me where I need to be, so I figured someone else may have
run into it.

Thanks!







    _______________________________________________________

Reply to this item at:

  <http://savannah.nongnu.org/bugs/?func=detailitem&item_id=15000>

_______________________________________________
  Message sent via/by Savannah
  http://savannah.nongnu.org/