You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Olivier FAURAX <of...@neotion.com> on 2008/10/02 07:57:11 UTC

externals and merge

Hello,

I use svn 1.5.2 as a client, and server has 1.5.
I have a branch, in which I create a directory with externals.

When I tried to merge my branch back to the trunk (svn merge -r 123:HEAD 
http://svnserver/branches/mybranch from local trunk directory), the new 
directory and subdirectories are created, excluding the externals.

If I do "svn up" to have the externals, I have this message :
"svn: Two top-level reports with no target"

The workaround is to commit this new directory in the trunk, and then do 
"svn up" to get the externals.

Is this normal behavior ?

Have a nice day
-- 
Olivier FAURAX

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org