On Thu, Aug 12, 2010 at 5:13 PM, Ulrich Eckhardt <eckha...@satorlaser.com> wrote: > On Thursday 12 August 2010, erlend olsen wrote: [...] >> B: commits new code. >> A: is happy because now everything works on his local copy. Then he pushes >> 'update' in netbeans before he commits..... SVN: now deletes all of A's >> changes and new files.. > > I don't think so, as SVN tries very hard to preserve any user changes. If a > file was deleted in the repository, SVN won't delete a local copy of a file > if that contains modifications. If a file was modified, and those changes > conflict with local changes, SVN will notify the user of this and attempt at > resolving the conflict, but it first moves all three versions to separate > files.
Unless A was using a svn client version 1.5.x or lower (i.e. pre-tree-conflict-detection). In that case, yes, I think an "incoming delete from update" could probably wipe away local modifications (if I'm not mistaken). Any idea which version of svn is incorporated into the netbeans version that A uses? -- Johan
