"Mike Javorski" <mjavorski@spokesoftware.com> writes:
> 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
> and for some reason it complains of on file
> "images/something_something_something.gif" is not under version control.
"tried doing a merge" could mean many things. We need the exact
commands, at least some idea of the data they were operating on, and
the output of those commands. (We might need more than that, but this
is a start anyway.) See the section "How To Report A Bug" in the file
BUGS in the Subversion dist.
> Well that's odd to begin with. So I did svn cleanup's on both WC's,
> re-checked both WC's out from scratch, reloaded the repo from a current
> backup, reloaded the repo from the backup just before the file was added
> and repeated all the commits between that and HEAD (only 10 or so) and
> still I get the same error..
See above.
> I am at my wits end here..
We are only at our wits' beginning, so have hope :-).
Send more info, please. I've removed dev@ from the CC list; until we
have reason to think there's a Subversion bug, let's keep it to
users@.
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jan 30 08:11:11 2004