Hi,
cvs status dumps core with an assertion failure after the following
sequence of events.
1. cvs checkout some branch
2. merge updates from another branch with -j rev1 and -j rev2 where some
files are added.
3. merge more updates from that branch with -j rev2 and -j rev3 where
changes in the newly added files are present.
This causes corruption of the Entries file. Instead of the value "0" in
the revision field, you will find "(null)".
This value in the Entries file triggers an assertion when running cvs
status.
The attached patch fixes the problem in a pragmatic way. There may be a
better fix, but this one works for me (tm).
Robert
--
Robert de Vries
[EMAIL PROTECTED]
--- cvs-1.10.8/src/update.c~ Wed Jan 5 17:35:46 2000
+++ cvs-1.10.8/src/update.c Fri May 12 23:25:49 2000
@@ -2533,7 +2533,8 @@
(void) time (&last_register_time);
cp = time_stamp (finfo->file);
}
- Register (finfo->entries, finfo->file, vers->vn_rcs,
+ Register (finfo->entries, finfo->file,
+ vers->vn_rcs ? vers->vn_rcs : "0",
"Result of merge", vers->options, vers->tag,
vers->date, cp);
if (cp)
