version 1.277, 2008/06/15 04:44:06 |
version 1.278, 2008/06/26 21:31:40 |
|
|
|
|
/* revision on branch, get the branch root */ |
/* revision on branch, get the branch root */ |
nextroot = 2; |
nextroot = 2; |
if (RCSNUM_ISBRANCHREV(tnum)) { |
bnum = rcsnum_alloc(); |
bnum = rcsnum_alloc(); |
if (RCSNUM_ISBRANCHREV(tnum)) |
rcsnum_cpy(tnum, bnum, nextroot); |
rcsnum_cpy(tnum, bnum, nextroot); |
} else { |
else |
bnum = tnum; |
rcsnum_cpy(tnum, bnum, tnum->rn_len); |
} |
|
|
|
if (alines != NULL) { |
if (alines != NULL) { |
/* start with annotate first at requested revision */ |
/* start with annotate first at requested revision */ |
|
|
annotate = ANNOTATE_NOW; |
annotate = ANNOTATE_NOW; |
|
|
/* annotate down to 1.1 from where we are */ |
/* annotate down to 1.1 from where we are */ |
if (bnum == tnum) |
rcsnum_free(bnum); |
bnum = rcsnum_alloc(); |
|
bnum = rcsnum_parse("1.1"); |
bnum = rcsnum_parse("1.1"); |
if (!rcsnum_differ(rdp->rd_num, bnum)) { |
if (!rcsnum_differ(rdp->rd_num, bnum)) { |
goto next; |
goto next; |
|
|
annotate = ANNOTATE_NOW; |
annotate = ANNOTATE_NOW; |
|
|
/* annotate down to 1.1 from where we are */ |
/* annotate down to 1.1 from where we are */ |
if (bnum == tnum) |
rcsnum_free(bnum); |
bnum = rcsnum_alloc(); |
|
bnum = rcsnum_parse("1.1"); |
bnum = rcsnum_parse("1.1"); |
|
|
if (!rcsnum_differ(rdp->rd_num, bnum)) |
if (!rcsnum_differ(rdp->rd_num, bnum)) |
|
|
xfree(*alines); |
xfree(*alines); |
*alines = NULL; |
*alines = NULL; |
cvs_freelines(dlines); |
cvs_freelines(dlines); |
if (bnum != tnum) |
rcsnum_free(bnum); |
rcsnum_free(bnum); |
|
return (NULL); |
return (NULL); |
} |
} |
fatal("expected branch not found on branch list"); |
fatal("expected branch not found on branch list"); |