| version 1.85, 2008/02/27 22:34:04 |
version 1.86, 2008/03/01 20:45:41 |
|
|
| if (ret == 0) { |
if (ret == 0) { |
| import_tag(cf, brev, rev); |
import_tag(cf, brev, rev); |
| rcsnum_free(brev); |
rcsnum_free(brev); |
| rcs_write(cf->file_rcs); |
if (cvs_noexec != 1) |
| |
rcs_write(cf->file_rcs); |
| |
cvs_printf("U %s/%s\n", import_repository, cf->file_path); |
| return; |
return; |
| } |
} |
| |
|
| if (cf->file_rcs->rf_branch != NULL) |
if (cf->file_rcs->rf_branch != NULL) |
| rcsnum_tostr(cf->file_rcs->rf_branch, branch, sizeof(branch)); |
rcsnum_tostr(cf->file_rcs->rf_branch, branch, sizeof(branch)); |
| |
|
| |
if (cf->file_rcs->rf_branch == NULL || cf->in_attic == 1 || |
| |
strcmp(branch, import_branch)) { |
| |
import_conflicts++; |
| |
cvs_printf("C %s/%s\n", import_repository, cf->file_path); |
| |
} else { |
| |
cvs_printf("U %s/%s\n", import_repository, cf->file_path); |
| |
} |
| |
|
| |
if (cvs_noexec == 1) |
| |
return; |
| |
|
| d = import_get_rcsdiff(cf, rev); |
d = import_get_rcsdiff(cf, rev); |
| newrev = rcsnum_inc(rev); |
newrev = rcsnum_inc(rev); |
| |
|
|
|
| fatal("import_update: failed to set deltatext"); |
fatal("import_update: failed to set deltatext"); |
| |
|
| import_tag(cf, brev, newrev); |
import_tag(cf, brev, newrev); |
| |
|
| if (cf->file_rcs->rf_branch == NULL || cf->in_attic == 1 || |
|
| strcmp(branch, import_branch)) { |
|
| import_conflicts++; |
|
| cvs_printf("C %s/%s\n", import_repository, cf->file_path); |
|
| } else { |
|
| cvs_printf("U %s/%s\n", import_repository, cf->file_path); |
|
| } |
|
| |
|
| if (kflag) |
if (kflag) |
| rcs_kwexp_set(cf->file_rcs, kflag); |
rcs_kwexp_set(cf->file_rcs, kflag); |
![[BACK]](/icons/back.gif){kind=icon}
Return to import.c CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / cvs