Re: "not under version control" error

On Wed, 2004-01-28 at 19:49, Mike Javorski wrote:
>
> We have a repos with two directories. One for our "staging" server, and
> one for the "active" server.
>
> Well I tried doing a merge from the staging branch to the active branch

You need to give a *lot* more detail if you want concrete help. Like,
show us your commandline output, for example.

> and for some reason it complains of on file
> "images/something_something_something.gif" is not under version control.

So apparently you're telling 'svn merge' to apply a certain tree-delta
(patch) to a working copy, the delta in question wants to make a change
to a certain gif file. But apparently that gif file isn't under version
control. Why is that? What's the story with that gif file? Is it
really part of your working copy? Is it supposed to be? What does 'svn
status' say about that gif file? None of us can guess without more
details.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jan 30 07:27:33 2004