"not under version control" error - continued

[Mike Javorski <mj...@spokesoftware.com>]

Okay.. Sorry I didn't just reply to the thread but my companies exchange
server blew up on Friday.. (grrr).. and it looks like exchange is
sending my emails out via an un-subscribed address so I had to resend
this.. Oh well.. Need to install postfix... Anyway)


I will try to include the details that were asked for by Ben John and
Karl.


The merge command I was running (as well as the output) is below:
 
$ svn merge ./@HEAD ../../webstage/images/@HEAD --dry-run
svn: Use --force to override this restriction
svn: 'border_dots-4x4-1.gif' is not under version control

Now this is not the same file it was croaking on previously.. This is a
one that was recently added to the repository. The file IS in the
webstage "branch" in subversion, it's in the WC and I took out a fresh
copy to be sure.

When I take out the "--dry-run" I get the following:
$ svn merge ./@HEAD ../../webstage/images/@HEAD
A  border_dots-4x4-1.gif
A  border_dots-4x4-2.gif
A  customer_centric_book.gif
A  linked_book.jpg
D         news_images/usatoday-sm.gif
D         news_images/ny_times_sm.gif
D         news_images
D  news_images
svn: Revision 134621606 doesn't match existing revision 88 in
'news_images'

Now the "news_images" directory is in BOTH "branches" and it's deleting
it?


If I run this merge from the root of the two WC's I get basically the
same result, except that the big revision # is 134621588 instead of
134621606 



Now it looks like this may not be a unique issue.. I say that because
Francois Beausoleil [fbos@users.sourceforge.net] posted to the user list
today that he was having a similar inconsistency between merges with
"--dry-run" and without. His seemed to be merging correctly without the
"--dry-run"; though I suspect if he commits a few more items
(directories esp.) it will become as bad as mine. (as everything new
that I add seems to be showing this problem).



Is this a better bit of information for you? Please let me know anything
else you might need.. I can provide _some_ of the content but in reality
I don't think the content itself is the specific trigger as it seems
everything added is screwing up on merges (though I have been wary to do
too much experimenting )



Thanks for the help.


- Mike



--------- ORIGINAL MESSAGE --------------

UPDATE: I have installed 0.37.0 and the problem remains (I even went
through all the different steps to try and work the problem out of the
system)

--------------------

Sorry for the cross-post but I am not sure if this is a low-level error
that the dev's would have more knowledge of.

I have a subversion repo for my company's website.. And up until today
everything was going great.. I am about to shoot the thing today
however.

Before I get into that though here is the specs:

- Gentoo Linux w/ 2.4.21 kernel
- SVN 0.35.1 (haven't been able to get 0.37.0 to compile yet)
- Apache 2.0.48 (using mod_svn for all repo access)
- DB 4.0.14 (same as apache is compiled against)


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.

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.. 

I am at my wits end here..


Anyone have any brilliant ideas that I may have overlooked?? Please :-D.


- Mike






---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org