version 1.154, 2015/11/05 09:48:21 |
version 1.155, 2016/10/13 20:51:25 |
|
|
if (brev != NULL) { |
if (brev != NULL) { |
if (RCSNUM_ISBRANCH(brev)) |
if (RCSNUM_ISBRANCH(brev)) |
goto next; |
goto next; |
rcsnum_free(brev); |
free(brev); |
} |
} |
|
|
brev = rcs_translate_tag(tag, cf->file_rcs); |
brev = rcs_translate_tag(tag, cf->file_rcs); |
|
|
"a branch for file %s", tag, |
"a branch for file %s", tag, |
cf->file_path); |
cf->file_path); |
conflicts_found++; |
conflicts_found++; |
rcsnum_free(brev); |
free(brev); |
return; |
return; |
} |
} |
|
|
|
|
"a branch for file %s", tag, |
"a branch for file %s", tag, |
cf->file_path); |
cf->file_path); |
conflicts_found++; |
conflicts_found++; |
rcsnum_free(branch); |
free(branch); |
rcsnum_free(brev); |
free(brev); |
return; |
return; |
} |
} |
|
|
|
|
"a branch for file %s", tag, |
"a branch for file %s", tag, |
cf->file_path); |
cf->file_path); |
conflicts_found++; |
conflicts_found++; |
rcsnum_free(branch); |
free(branch); |
rcsnum_free(brev); |
free(brev); |
return; |
return; |
} |
} |
} |
} |
} |
} |
|
|
next: |
next: |
if (branch != NULL) |
free(branch); |
rcsnum_free(branch); |
free(brev); |
if (brev != NULL) |
|
rcsnum_free(brev); |
|
|
|
if (cf->file_status != FILE_ADDED && |
if (cf->file_status != FILE_ADDED && |
cf->file_status != FILE_REMOVED && |
cf->file_status != FILE_REMOVED && |
|
|
d = NULL; |
d = NULL; |
|
|
if (cf->file_rcs != NULL && cf->file_rcs->rf_branch != NULL) { |
if (cf->file_rcs != NULL && cf->file_rcs->rf_branch != NULL) { |
rcsnum_free(cf->file_rcs->rf_branch); |
free(cf->file_rcs->rf_branch); |
cf->file_rcs->rf_branch = NULL; |
cf->file_rcs->rf_branch = NULL; |
} |
} |
|
|
|
|
cf->file_path); |
cf->file_path); |
|
|
if (tag != NULL) { |
if (tag != NULL) { |
rcsnum_free(crev); |
free(crev); |
rcsnum_free(rrev); |
free(rrev); |
brev = rcs_sym_getrev(cf->file_rcs, tag); |
brev = rcs_sym_getrev(cf->file_rcs, tag); |
crev = rcs_translate_tag(tag, cf->file_rcs); |
crev = rcs_translate_tag(tag, cf->file_rcs); |
if (brev == NULL || crev == NULL) { |
if (brev == NULL || crev == NULL) { |
|
|
fatal("this isnt suppose to happen, honestly"); |
fatal("this isnt suppose to happen, honestly"); |
} |
} |
|
|
rcsnum_free(brev); |
free(brev); |
rcsnum_free(rrev); |
free(rrev); |
rrev = rcsnum_branch_root(nrev); |
rrev = rcsnum_branch_root(nrev); |
|
|
/* branch stuff was checked in cvs_commit_check_files */ |
/* branch stuff was checked in cvs_commit_check_files */ |
|
|
strlcpy(rbuf, "Non-existent", sizeof(rbuf)); |
strlcpy(rbuf, "Non-existent", sizeof(rbuf)); |
} |
} |
|
|
if (rrev != NULL) |
free(rrev); |
rcsnum_free(rrev); |
|
isnew = 0; |
isnew = 0; |
if (cf->file_status == FILE_ADDED) { |
if (cf->file_status == FILE_ADDED) { |
isnew = 1; |
isnew = 1; |
|
|
break; |
break; |
} |
} |
|
|
if (crev != NULL) |
free(crev); |
rcsnum_free(crev); |
|
|
|
if (histtype != -1) |
if (histtype != -1) |
cvs_history_add(histtype, cf, NULL); |
cvs_history_add(histtype, cf, NULL); |