| version 1.103, 2015/01/16 06:40:07 |
version 1.104, 2015/04/04 14:19:10 |
|
|
| ent->ce_rev = NULL; |
ent->ce_rev = NULL; |
| ent->ce_date = -1; |
ent->ce_date = -1; |
| ent->ce_tag = NULL; |
ent->ce_tag = NULL; |
| |
ent->ce_time = NULL; |
| |
|
| if (ent->ce_type == CVS_ENT_FILE) { |
if (ent->ce_type == CVS_ENT_FILE) { |
| if (*fields[2] == '-') { |
if (*fields[2] == '-') { |
|
|
| if (strncmp(fields[3], "Result of merge+", 16) == 0) |
if (strncmp(fields[3], "Result of merge+", 16) == 0) |
| p += 16; |
p += 16; |
| |
|
| |
ent->ce_time = xstrdup(p); |
| |
|
| /* Date field can be a '+=' with remote to indicate |
/* Date field can be a '+=' with remote to indicate |
| * conflict. In this case do nothing. */ |
* conflict. In this case do nothing. */ |
| if (strptime(p, "%a %b %d %T %Y", &t) != NULL) { |
if (strptime(p, "%a %b %d %T %Y", &t) != NULL) { |
|
|
| { |
{ |
| if (ent->ce_rev != NULL) |
if (ent->ce_rev != NULL) |
| rcsnum_free(ent->ce_rev); |
rcsnum_free(ent->ce_rev); |
| |
if (ent->ce_time != NULL) |
| |
xfree(ent->ce_time); |
| |
|
| xfree(ent->ce_buf); |
xfree(ent->ce_buf); |
| xfree(ent); |
xfree(ent); |
| } |
} |
![[BACK]](/icons/back.gif){kind=icon}
Return to entries.c CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / cvs