version 1.78, 2006/06/29 00:41:52 |
version 1.79, 2006/07/02 21:01:48 |
|
|
} |
} |
|
|
if (cf->file_status == FILE_CONFLICT || |
if (cf->file_status == FILE_CONFLICT || |
cf->file_status == FILE_LOST || |
cf->file_status == FILE_UNLINK) { |
cf->file_status == FILE_UNLINK) |
|
conflicts_found++; |
conflicts_found++; |
|
return; |
|
} |
|
|
if (cf->file_status != FILE_REMOVED && |
if (cf->file_status != FILE_REMOVED && |
update_has_conflict_markers(cf)) { |
update_has_conflict_markers(cf)) { |
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; |
} |
} |
|
|
if (cf->file_status == FILE_MERGE || |
if (cf->file_status == FILE_MERGE || |
cf->file_status == FILE_PATCH || |
cf->file_status == FILE_PATCH || |
cf->file_status == FILE_CHECKOUT) { |
cf->file_status == FILE_CHECKOUT || |
|
cf->file_status == FILE_LOST) { |
cvs_log(LP_ERR, "conflict: %s is not up-to-date", |
cvs_log(LP_ERR, "conflict: %s is not up-to-date", |
cf->file_path); |
cf->file_path); |
conflicts_found++; |
conflicts_found++; |
|
return; |
} |
} |
|
|
if (cf->file_status == FILE_ADDED || |
if (cf->file_status == FILE_ADDED || |