236 |
finfo->fullname); |
finfo->fullname); |
237 |
ret = T_REMOVE_ENTRY; |
ret = T_REMOVE_ENTRY; |
238 |
} |
} |
239 |
else if (strcmp (vers->ts_user, vers->ts_rcs) == 0) |
else if (strcmp (vers->ts_user, vers->ts_rcs) |
240 |
{ |
&& No_Difference (finfo, vers)) |
|
|
|
|
/* |
|
|
* The user file is still unmodified, so just remove it from |
|
|
* the entry list |
|
|
*/ |
|
|
if (!really_quiet) |
|
|
error (0, 0, "`%s' is no longer in the repository", |
|
|
finfo->fullname); |
|
|
ret = T_REMOVE_ENTRY; |
|
|
} |
|
|
else if (No_Difference (finfo, vers)) |
|
241 |
{ |
{ |
242 |
/* they are different -> conflict */ |
/* they are different -> conflict */ |
243 |
if (!really_quiet) |
if (!really_quiet) |
249 |
} |
} |
250 |
else |
else |
251 |
{ |
{ |
252 |
/* they weren't really different */ |
|
253 |
|
/* |
254 |
|
* The user file is still unmodified, so just remove it from |
255 |
|
* the entry list |
256 |
|
*/ |
257 |
if (!really_quiet) |
if (!really_quiet) |
258 |
error (0, 0, |
error (0, 0, "`%s' is no longer in the repository", |
|
"warning: `%s' is not (any longer) pertinent", |
|
259 |
finfo->fullname); |
finfo->fullname); |
260 |
ret = T_REMOVE_ENTRY; |
ret = T_REMOVE_ENTRY; |
261 |
} |
} |