Re: CVS /sqlite problems
| From: | Curt Zirzow | Date: | Tue, 14 Sep 2004 06:00:12 +0000 |
| Subject: | Re: CVS /sqlite problems | ||
| References: | 1 2 3 | Groups: | php.doc.web |
| Request: | Send a blank email to doc-web+get-315@lists.php.net to get a copy of this message | ||
* Thus wrote Vincent Gevers:
> On Monday 13 September 2004 23:38, Gabor Hojtsy wrote:
> > > Once in a while I check my cvs update log..
> > >
> > > Now I noticed that I'm getting errors every update:
> > >
> > > cvs update: move away `sqlite/.cvsignore'; it is in the way
> > > C sqlite/.cvsignore
> >
> ...
> > You have a .cvsignore file i the sqlite folder, which was never
> > committed to CVS. But now there is one file in CVS, and the update is
> > unable to put the file there, since your local file is in the way.
>
> I tried removing it.
> after that cvs up went fine...
>
> but after another cvs up I'm getting the same error again.
The 'C sqlite/.cvsignore' means there is a conflict. Meaning if
you modify .cvsignore and someone goes and modifies the file and
commits it. If the cvs client can't figure out how to merge them
together it gives that error.
If this keeps happening, and the above isn't happening, I'm
guessing that somewhere the file is getting converted from unix
format to dos or vise versa. Which will cause such a message from
the cvs client.
>
> I'll check if google works (isp routing probs) again when I come back from
> school
>
> also, cvs status sqlite/.cvsignore says:
> File: .cvsignore Status: Up-to-date
iirc, status just checks revision # differnces.
Curt
--
First, let me assure you that this is not one of those shady pyramid schemes
you've been hearing about. No, sir. Our model is the trapezoid!