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

I'm 90% sure this is a known limitation in Subversion, which can be
summarized as "You can't merge a rename on one branch with an edit on
another, because Subversion doesn't do Real Renames". Unfortunately I
can't find a relevant issue in Subversion's issue tracker, but I'm
still looking.

-- 
Software is largely a service industry operating under the
persistent but unfounded delusion that it is a manufacturing
industry.
        -- Eric Raymond
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org