> Mark Derricutt [mailto:[EMAIL PROTECTED]] once wrote:
> So I need to merge branch_level2 into branch_level1 first, THEN
> branch_level1 into HEAD?
That is the usual approach.
Have a look in Chapter "Branching and merging" in the Cederqvist
Manual.
Guus
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.
T
