Re: [TSVN] Merge problem

Micha³ Mielniczuk wrote:

>>I try to do branch->trunk merge [...] and always get an error message
>
> 'Cannot replace a
>
>>directory from within'.
>
> I did some tests and I discovered that this error appears only if there are
> spaces in branch name (for example 'version 5.0'). If I created a new branch
> called 'version_5.0' and did the same modifications, I could use merge
> option without errors.

If you enter an URL, you _must_ properly escape it! That means, a space
becomes %20 (e.g. version%205.0). Everything else is _not_ an URL and
therefore won't work.

> But there is a new question. Is there any chance to change branch name for
> all its revisions (maybe I can edit something in repository files)? Without
> doing this, the only way to do final merge is recreation of a branch with
> correct name and doing again modifications from all branch revisions.

Only by manually editing the repository. I wouldn't recommend that.

Stefan

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Aug 9 15:42:16 2004