version 1.161, 2010/07/13 21:33:44 |
version 1.162, 2010/07/23 21:46:05 |
|
|
break; |
break; |
case 'D': |
case 'D': |
dateflag = optarg; |
dateflag = optarg; |
cvs_specified_date = cvs_date_parse(dateflag); |
cvs_specified_date = date_parse(dateflag); |
reset_tag = 0; |
reset_tag = 0; |
break; |
break; |
case 'd': |
case 'd': |
|
|
BUF *bp; |
BUF *bp; |
int conflict; |
int conflict; |
char *content; |
char *content; |
struct cvs_line *lp; |
struct rcs_line *lp; |
struct cvs_lines *lines; |
struct rcs_lines *lines; |
size_t len; |
size_t len; |
|
|
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->file_flags & FILE_ON_DISK) || 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 = buf_load_fd(cf->fd); |
|
|
cvs_buf_putc(bp, '\0'); |
buf_putc(bp, '\0'); |
len = cvs_buf_len(bp); |
len = buf_len(bp); |
content = cvs_buf_release(bp); |
content = buf_release(bp); |
if ((lines = cvs_splitlines(content, len)) == NULL) |
if ((lines = cvs_splitlines(content, len)) == NULL) |
fatal("update_has_conflict_markers: failed to split lines"); |
fatal("update_has_conflict_markers: failed to split lines"); |
|
|
|
|
|
|
if ((p = strchr(jrev2, ':')) != NULL) { |
if ((p = strchr(jrev2, ':')) != NULL) { |
(*p++) = '\0'; |
(*p++) = '\0'; |
cvs_specified_date = cvs_date_parse(p); |
cvs_specified_date = date_parse(p); |
} |
} |
|
|
rev2 = rcs_translate_tag(jrev2, cf->file_rcs); |
rev2 = rcs_translate_tag(jrev2, cf->file_rcs); |
|
|
if (jrev1 != NULL) { |
if (jrev1 != NULL) { |
if ((p = strchr(jrev1, ':')) != NULL) { |
if ((p = strchr(jrev1, ':')) != NULL) { |
(*p++) = '\0'; |
(*p++) = '\0'; |
cvs_specified_date = cvs_date_parse(p); |
cvs_specified_date = date_parse(p); |
} |
} |
|
|
rev1 = rcs_translate_tag(jrev1, cf->file_rcs); |
rev1 = rcs_translate_tag(jrev1, cf->file_rcs); |