[sword-devel] OSIS Web tool-CVS question

[Don A. Elbourne Jr.]

Gotcha. Thanks.

by grace alone,

Don A. Elbourne Jr.
http://elbourne.org


----- Original Message ----- 
From: "Troy A. Griffitts" <scribe@crosswire.org>
To: <sword-devel@crosswire.org>
Sent: Tuesday, October 28, 2003 12:51 AM
Subject: Re: [sword-devel] OSIS Web tool-CVS question


> Don,
> This usually happens when somebody copied or created the wash.css file
> in your directory INSTEAD OF CVS PLACING IT THERE.
>
> Basically CVS is saying, "Hey, there's a new file that I've never
> copied to your 'shadow', but I can't copy it because there's already a
> file there with the same name."  You can just delete it (or if you have
> changes that you want to preserve, move it to your home directory with
> this command:
>
> mv wash.css ~
>
> then do a checkout again and CVS will copy the file from the repository
> to your 'shadow'.  You can then either edit the wash.css and commit it
> back, or copy (if you're sure you won't overwrite anyone's work) the
> file back from your home over the top of the one CVS checked out:
>
> mv ~/wash.css .
>
> and commit that.
>
> Hope this helps and makes sense.
>
> -Troy.
>
> Don A. Elbourne Jr. wrote:
> > Troy,
> >
> > I hate to bother you with this, but I don't understand what this means.
When
> > I do cvs update -d I get the following:
> >
> >
> > ? wash.css
> > cvs server: Updating .
> > cvs update: move away ./wash.css; it is in the way
> > C wash.css
> >
> > _______________________________________________
> > sword-devel mailing list
> > sword-devel@crosswire.org
> > http://www.crosswire.org/mailman/listinfo/sword-devel
>
> _______________________________________________
> sword-devel mailing list
> sword-devel@crosswire.org
> http://www.crosswire.org/mailman/listinfo/sword-devel