version 1.57, 2006/12/14 09:31:17 |
version 1.58, 2007/01/03 22:28:30 |
|
|
} |
} |
|
|
if (removed != 0) { |
if (removed != 0) { |
if (verbosity > 1) { |
if (verbosity > 0) { |
cvs_log(LP_NOTICE, |
cvs_log(LP_NOTICE, |
"use '%s commit' to remove %s " |
"use '%s commit' to remove %s " |
"permanently", __progname, (removed > 1) ? |
"permanently", __progname, (removed > 1) ? |
|
|
cf->file_name); |
cf->file_name); |
existing++; |
existing++; |
} else { |
} else { |
switch(cf->file_status) { |
switch (cf->file_status) { |
case FILE_ADDED: |
case FILE_ADDED: |
entlist = cvs_ent_open(cf->file_wd); |
entlist = cvs_ent_open(cf->file_wd); |
cvs_ent_remove(entlist, cf->file_name); |
cvs_ent_remove(entlist, cf->file_name); |
|
|
} |
} |
return; |
return; |
case FILE_REMOVED: |
case FILE_REMOVED: |
if (verbosity > 1 ) { |
if (verbosity > 0) { |
cvs_log(LP_ERR, |
cvs_log(LP_ERR, |
"file `%s' already scheduled for removal", |
"file `%s' already scheduled for removal", |
cf->file_name); |
cf->file_name); |
|
|
if (l == -1 || l >= CVS_ENT_MAXLINELEN) |
if (l == -1 || l >= CVS_ENT_MAXLINELEN) |
fatal("cvs_remove_local: overflow"); |
fatal("cvs_remove_local: overflow"); |
|
|
entlist = cvs_ent_open(cf->file_wd); |
if (cvs_server_active == 1) { |
cvs_ent_add(entlist, entry); |
cvs_server_update_entry("Checked-in", cf); |
cvs_ent_close(entlist, ENT_SYNC); |
cvs_remote_output(entry); |
|
} else { |
|
entlist = cvs_ent_open(cf->file_wd); |
|
cvs_ent_add(entlist, entry); |
|
cvs_ent_close(entlist, ENT_SYNC); |
|
} |
|
|
xfree(entry); |
xfree(entry); |
|
|
if (verbosity > 1) { |
if (verbosity > 0) { |
cvs_log(LP_NOTICE, |
cvs_log(LP_NOTICE, |
"scheduling file `%s' for removal", |
"scheduling file `%s' for removal", |
cf->file_name); |
cf->file_name); |