Re: [TSVN] File moved on server not merged on client

Matthew Mastracci wrote:
> I've encountered a problem with TortoiseSVN (or is it Subversion
> itself) that manifests itself when a file is moved on the server by
> one user and modified locally by another.
[snip]
> I don't know if it's my lack of experience with Subversion, but I
> would have expected the file's server-side move to be "merged" on the
> client side after an update.
>
> Is this a bug in TortoiseSVN or Subversion, or is expected behaviour
> with server-side moves in Subversion? I've scoured the Subversion
> documentation and I can't find any reference to what is supposed to
> happen in this case.

This is expected behaviour in Subversion (TSVN is a client which uses
SVN's libraries to handle the data). It's what you might call an edge
case. Subversion never throws away your local modifications, so it keeps
your modified copy as well as the moved version. I guess this is a side
effect of the way SVN handles moves, which is done by adding a copy and
deleting the original file. This may get better when subversion supports
true renaming, but that is a little way off yet - I would guess at SVN
1.3, and we are waiting for the 1.2 release sometime around April/May.

Simon

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org