bugConcurrent Versions System - Bugs: bug #15000, cvs status gets confused by...


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

Submitted by:  None
Submitted on:  Fri 18 Nov 2005 07:37:06 AM UTC  
Category:  None Severity:  3 - Normal
Item Group:  None Status:  Need Info
Privacy:  Public Assigned to:  None
Open/Closed:  Closed Release:  1.12.12, 1.12.13
Fixed Release:  None Fixed Feature Release:  None

Add a New Comment(Rich Markup)

You are not logged in

Please log in, so followups can be emailed to you.


Mon 28 Aug 2006 08:08:49 PM UTC, comment #2:

Closing for lack of response.

Derek Robert Price <dprice>
Project Administrator
Fri 09 Dec 2005 05:37:35 PM UTC, comment #1:

This doesn't sound like the right fix, just a work-around. We need to know how "Result of merge" got in there without being followed by "+TIMESTAMP". Can you provide a reproducable test case that gets "Result of merge" into CVS/Entries without a time stamp?


Derek Robert Price <dprice>
Project Administrator
Fri 18 Nov 2005 07:37:06 AM UTC, original submission:

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/ 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: cvs status: Can't parse date/time: `Result of merge UTC'.
Result of merge UTC
Repository revision: /proj/cvsroot/iim/extdbg.c,v
Commit Identifier: (none)
Sticky Tag: mxb_pager (branch:
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.




(Note: upload size limit is set to 16384 kB, after insertion of the required escape characters.)

Attach Files:

No files currently attached


Depends on the following items: None found

Items that depend on this one: None found


CC list is empty


Do you think this task is very important?
If so, you can add your encouragement to it.
This task has 0 encouragements so far.

Only logged-in users can vote.




Follow 3 latest changes.

Date Changed by Updated Field Previous Value => Replaced by
2006-08-28 dprice Open/ClosedOpen => Closed
    Release => 1.12.12, 1.12.13
2005-12-09 dprice StatusNone => Need Info

Back to the top

Powered by Savane 3.3