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

Simon/Eric:

Eric Hanchrow wrote:
> 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.

Thanks for the feedback. At least it's a known limitation. It's
certainly no worse than the current situation with CVS and server-side
"moves". :)

Matt.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Mar 16 22:36:16 2005