[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [TSVN] Merge problem

From: Micha³ Mielniczuk <mmielni_at_msm.com.pl>
Date: 2004-08-09 11:14:31 CEST

> 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.

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.

Michael

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Aug 9 12:22:06 2004

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.