different repository root than its parent

[Sorry if this is a re-post... not sure I have this thing working right...]

Advice for the clueless sought. I'm having trouble with a merge after
adding/deleting/moving files on a branch. The merge gets confused. Any
suggestions on how to extricate myself / do it right next time?

Details:
I created a branch.
I moved around some files in the branch, added and deleted some
directories.
I committed all changes to the branch.
I checkout the trunk, cd to trunk, then:

\Sandbox\trunk>svn update
At revision 235.

\Sandbox\trunk>svn merge file:///e:/repos/trunk_at_235
file:///e:/repos/branches/movedirs_at_235

which deletes a whole bunch of files then says:
svn: The URL 'file:///e:/repos/branches/movedirs/python' has a
different repository root than its parent

Any suggestions on what I am supposed to do about this? Or which part
of the manual to go back and read again?

Thanks,

Andy

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Dec 1 20:55:58 2007