version 1.156, 2008/06/28 13:10:02 |
version 1.157, 2009/02/21 14:50:53 |
|
|
|
|
cvs_log(LP_TRACE, "update_has_conflict_markers(%s)", cf->file_path); |
cvs_log(LP_TRACE, "update_has_conflict_markers(%s)", cf->file_path); |
|
|
if (cf->fd == -1 || cf->file_ent == NULL) |
if (!(cf->file_flags & FILE_ON_DISK) || cf->file_ent == NULL) |
return (0); |
return (0); |
|
|
bp = cvs_buf_load_fd(cf->fd); |
bp = cvs_buf_load_fd(cf->fd); |
|
|
} |
} |
|
|
if (rev1 == NULL || !strcmp(state1, RCS_STATE_DEAD)) { |
if (rev1 == NULL || !strcmp(state1, RCS_STATE_DEAD)) { |
if (cf->fd != -1) { |
if (cf->file_flags & FILE_ON_DISK) { |
cvs_printf("%s exists but has been added in %s\n", |
cvs_printf("%s exists but has been added in %s\n", |
cf->file_path, jrev2); |
cf->file_path, jrev2); |
} else { |
} else { |
|
|
if (!rcsnum_cmp(rev1, rev2, 0)) |
if (!rcsnum_cmp(rev1, rev2, 0)) |
goto out; |
goto out; |
|
|
if (cf->fd == -1) { |
if (!(cf->file_flags & FILE_ON_DISK)) { |
cvs_printf("%s does not exist but is present in %s\n", |
cvs_printf("%s does not exist but is present in %s\n", |
cf->file_path, jrev2); |
cf->file_path, jrev2); |
goto out; |
goto out; |