version 1.135, 2008/06/08 20:08:43 |
version 1.136, 2008/06/09 22:31:24 |
|
|
{ |
{ |
char *tag; |
char *tag; |
RCSNUM *branch, *brev; |
RCSNUM *branch, *brev; |
char rev[CVS_REV_BUFSZ]; |
|
struct cvs_dirlist *d; |
struct cvs_dirlist *d; |
|
|
branch = brev = NULL; |
branch = brev = NULL; |
|
|
return; |
return; |
} |
} |
|
|
if (cf->file_status == FILE_CONFLICT || |
if (cf->file_status == FILE_UPTODATE) |
|
return; |
|
|
|
if (cf->file_status == FILE_MERGE || |
|
cf->file_status == FILE_PATCH || |
|
cf->file_status == FILE_CHECKOUT || |
|
cf->file_status == FILE_LOST || |
cf->file_status == FILE_UNLINK) { |
cf->file_status == FILE_UNLINK) { |
|
cvs_log(LP_ERR, "conflict: %s is not up-to-date", |
|
cf->file_path); |
conflicts_found++; |
conflicts_found++; |
return; |
return; |
} |
} |
|
|
if (cf->file_status != FILE_REMOVED && |
if (cf->file_status == FILE_CONFLICT && |
update_has_conflict_markers(cf)) { |
cf->file_ent->ce_conflict != NULL) { |
cvs_log(LP_ERR, "conflict: unresolved conflicts in %s from " |
cvs_log(LP_ERR, "conflict: unresolved conflicts in %s from " |
"merging, please fix these first", cf->file_path); |
"merging, please fix these first", cf->file_path); |
conflicts_found++; |
conflicts_found++; |
return; |
return; |
} |
} |
|
|
if (cf->file_status == FILE_MERGE || |
if (cf->file_status == FILE_MODIFIED && |
cf->file_status == FILE_PATCH || |
cf->file_ent->ce_conflict != NULL && |
cf->file_status == FILE_CHECKOUT || |
update_has_conflict_markers(cf)) { |
cf->file_status == FILE_LOST) { |
cvs_log(LP_ERR, "warning: file %s seems to still contain " |
cvs_log(LP_ERR, "conflict: %s is not up-to-date", |
"conflict indicators", cf->file_path); |
cf->file_path); |
|
conflicts_found++; |
|
return; |
|
} |
} |
|
|
if (cf->file_ent != NULL && cf->file_ent->ce_date != -1) { |
if (cf->file_ent != NULL && cf->file_ent->ce_date != -1) { |
|
|
cf->file_ent->ce_tag); |
cf->file_ent->ce_tag); |
} |
} |
|
|
rcsnum_tostr(brev, rev, sizeof(rev)); |
|
if ((branch = rcsnum_revtobr(brev)) == NULL) { |
if ((branch = rcsnum_revtobr(brev)) == NULL) { |
cvs_log(LP_ERR, "%s is not a branch revision", |
cvs_log(LP_ERR, "sticky tag %s is not " |
rev); |
"a branch for file %s", tag, |
|
cf->file_path); |
conflicts_found++; |
conflicts_found++; |
rcsnum_free(brev); |
rcsnum_free(brev); |
return; |
return; |
} |
} |
|
|
if (!RCSNUM_ISBRANCHREV(brev)) { |
if (!RCSNUM_ISBRANCHREV(brev)) { |
cvs_log(LP_ERR, "%s is not a branch revision", |
cvs_log(LP_ERR, "sticky tag %s is not " |
rev); |
"a branch for file %s", tag, |
|
cf->file_path); |
conflicts_found++; |
conflicts_found++; |
rcsnum_free(branch); |
rcsnum_free(branch); |
rcsnum_free(brev); |
rcsnum_free(brev); |
return; |
return; |
} |
} |
|
|
rcsnum_tostr(branch, rev, sizeof(rev)); |
|
if (!RCSNUM_ISBRANCH(branch)) { |
if (!RCSNUM_ISBRANCH(branch)) { |
cvs_log(LP_ERR, "%s (%s) is not a branch", |
cvs_log(LP_ERR, "sticky tag %s is not " |
cf->file_ent->ce_tag, rev); |
"a branch for file %s", tag, |
|
cf->file_path); |
conflicts_found++; |
conflicts_found++; |
rcsnum_free(branch); |
rcsnum_free(branch); |
rcsnum_free(brev); |
rcsnum_free(brev); |