weird SVN merging issues

Does the file contain the histroy for the commit you are missing?

I've never had any problems of this sort with SVN. The only thing I can think of is that the commit never went through because you had changes on the server and you didn't sync before your commit.

Cheers
Chris

I'm a happy SVN user and never saw the issues you're encountering. Maybe you can find what's causing your problem @ http://www.svnforum.org/

(I used other versioning software before - not CVS though - and SVN is the one I'm most satisfied with so far).

The file on the server does contain the correct information in revision 1896, however in revision 1906, its changed back to the initial state and the guy who committed it, never touched that area of code. I would like to say that this is not an isolated incident and we have been having the issues for approximately one month or so.

1 Last thing...we have the most recent client for SVN.

tHom

It sounds like wither people are not doing updates before they commit (and are using --force), or else are copying files into and out of their local working copies so they clobber updates. Either one defeats the purpose of SVN.

I have certainly never seen that problem without improper usage. On the contrary: I often get conflicts on updates that make no sense and have to be examined character by character to resolve before I can commit.

--smw

I will agree with Bregma where I have seen SVN give a conflict on a blank line before. As far as your other 2 points, SVN won't let you commit until you've updated (and we're all using only the Windows GUI version), so I cannot see how this could even happen. As far as #2 I don't see that happening but I will check with everyone else.

thanks again,

tHom