Hiya, I have a project that has a 2nd level branch:
HEAD
branch_level1
branch_level2
I now wish to merge everything from branch_level2 (and branc_level1) into
the HEAD branch, so first I "cvs update -A"'d to get the head branch,
merging in branch_level2 didn't seem like it merged everything, so I tried
to merge branch_level1 (from the HEAD) and got the following error:
R SourceCode/DatasetEdit.dfm
cvs: rcs.c:4338: RCS_checkout: Assertion `rev == ((void *)0) ||
(__ctype_b[(int) (((unsigned char) *rev))] & (unsigned short
int) _ISdigit)' failed.
Terminated with fatal signal 6
*****CVS exited normally with code 1*****
So I need to merge branch_level2 into branch_level1 first, THEN
branch_level1 into HEAD?
--
"We don't guarantee anything except that it will take up disk space..."
Apache 2.0alpha5 Disclaimer
Now Playing: <no audio cd present>
