Subversion 1.6.x lose registration changes

Question

I am trying to find out if this is a known SVN 1.6.x issue. Developer A modifies the file and commits it. Developer B modifies the same file. Attempts to commit it and receives an outdated local copy, as well as an update and then commit.

However, changes from Developer A are lost, so the result file contains only the version that Developer B is included in.

We see this in magazines. This happens when the same file is modified, but in different places.

Has anyone else experienced this? We have had it 4 or 5 times in the last few weeks, and we have lost half a day or so each time trying to figure out what was lost, etc.

We are starting to lose confidence in SVN. Should we think about switching to GIT or Mercurial? Will this solve this problem?

Answer 1

Does any of your team manually copy files and folders so that the revision information in the .svn folders ceases to be correct?

As desobert describes in response to the corresponding question, overwriting changes by other users is possible if you manually copy the changed files to the newly updated SVN folder:

Here's how the nuke / copy procedure can undo other people's changes:

• Place an order, get r1;
• Modify foo.c to give r1 + changes;
• - foo.c( , , , ), foo.c r2;
• , foo.c(r1 + changes);
• , foo.c r2.
• foo.c (r1 + ). , , , r2, r1.
• Checkin, foo.c r3, r2.

Answer 2

, "svn update" ( ), , , - .

: . , , Eclipse Visual Studio, Subversion, .