| version 1.24, 2006/04/12 08:23:30 |
version 1.25, 2006/04/13 00:58:25 |
|
|
| rev2 = NULL; |
rev2 = NULL; |
| } |
} |
| |
|
| rcs_set_rev(rev_str1, &rev1); |
if ((rev1 = rcs_getrevnum(rev_str1, file)) == NULL) |
| if (rev_str2 != NULL) |
fatal("invalid revision: %s", rev_str1); |
| rcs_set_rev(rev_str2, &rev2); |
if (rev_str2 != NULL) { |
| else { |
if ((rev2 = rcs_getrevnum(rev_str2, file)) == NULL) |
| |
fatal("invalid revision: %s", rev_str2); |
| |
} else { |
| rev2 = rcsnum_alloc(); |
rev2 = rcsnum_alloc(); |
| rcsnum_cpy(file->rf_head, rev2, 0); |
rcsnum_cpy(file->rf_head, rev2, 0); |
| } |
} |
![[BACK]](/icons/back.gif){kind=icon}
Return to rcsmerge.c CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / rcs