On 3/16/2010 12:25 PM, Steve Calamia wrote:
I have a strange scenario: We are two developers that use an SVN repository to coordinate code releases. I pull down the repository daily, often several times a day. I recently committed to the server and it "blew away" my coworker’s changes, without any sort of conflict. Like not a few lines of code, but a hundred or so. This has happened twice now on two separate occasions both recent.
What does 'pull down the repository' mean?
Here's the catch: I actually saw in my local dev some of the code that got blown away by my most recent commit. So the code must have been in my local repository prior to committing. Any way to check this? Local logs or anything?
What's a local repository? You should each have working copies checked out and be committing to the same repository. If you update, change, commit, there won't be conflicts and you can change whatever you want. You get conflicts if you don't update for a while, make changes and when you try to commit someone else has updated the same thing.
I am using version 1.6.5 and the svn server is on Unfuddle. Any ideas how or why it would have overwritten the file with an older version upon committing?
Commits should only send back changes between your visible working copy and the pristine copy originally checked out (and saved in the .svn metadata directory). If you do an 'svn diff' you should see the changes you have locally vs. what you checked out. You can also diff against older revisions or check them back out if you need to undo some damage.
Also, any ideas where the problem may lay: my svn client, coworker's svn client, or Unfuddle?
Are you using an editor that likes to reformat the whole file to make it pretty whenever you touch something? Maybe you changed more than you thought - or took the wrong thing in an update conflict.
-- Les Mikesell lesmikes...@gmail.com
