version 1.151, 2008/06/12 07:16:14 |
version 1.152, 2008/06/12 16:55:48 |
|
|
cvs_ent_add(ent, entry); |
cvs_ent_add(ent, entry); |
cvs_ent_close(ent, ENT_SYNC); |
cvs_ent_close(ent, ENT_SYNC); |
cf->file_ent = cvs_ent_parse(entry); |
cf->file_ent = cvs_ent_parse(entry); |
xfree(entry); |
|
} |
} |
} else { |
} else { |
if (co_flags & CO_MERGE) { |
if (co_flags & CO_MERGE) { |
|
|
|
|
if (!(co_flags & CO_REMOVE)) { |
if (!(co_flags & CO_REMOVE)) { |
cvs_remote_output(entry); |
cvs_remote_output(entry); |
xfree(entry); |
|
|
|
if (!(co_flags & CO_MERGE)) { |
if (!(co_flags & CO_MERGE)) { |
mode = cf->file_rcs->rf_mode; |
mode = cf->file_rcs->rf_mode; |
|
|
} |
} |
} |
} |
} |
} |
|
|
|
xfree(entry); |
} |
} |