Martin J?rgensen <[EMAIL PROTECTED]> wrote: > >>cvs update: move away ./.cvsignore; it is in the way > But why doesn't it write: > C .cvsignore > Like it used to do, when updating to tell that there's a conflict here???
Who knows, but it's a different kind of conflict. The usual conflicts are overlapping changes by two people, but this one is a collision between a non-cvs file in your sandbox and a file added under the same name by someone else. The two kinds are detected at different places in the CVS code and the two messagea are different. They probably *should* be different, since the corrective actions are different: edit conflict markers in one case, rename a file in the other case. -- pa at panix dot com _______________________________________________ info-cvs mailing list info-cvs@nongnu.org http://lists.nongnu.org/mailman/listinfo/info-cvs
