Merging from Branch from Working Copy

Hello. I have a question about merging.

Here is my scenario:

- I modified my working copy, creating a new directory and then moving a
couple files into it.

- Next, I created a branch from the working copy.

- Then I modified the files in the branch.

- Then I tried to merge the changes back to the trunk.

When I try to merge the changes back to trunk, I get an error generally
like this:

svn: The URL 'https://<ip address>/<etc., etc.>/<Branch Name>/<New
Directory Name>' has a different repository root than its parent

Well, this seems to be an issue because the new directory that I created
was not previously existing in the repository, and hence it has no "parent".

Is there some way to work around this issue so that I can merge the work
back into the trunk? If I merge from the next newer revision in the
branch, it will not have an error, but it obviously loses some of the
edits I made.

By the way, this happened when I was giving a demonstration of
Subversion (want to replace VSS), so this isn't an actual problem at
this point. I'm new to Subversion, however, and I would like to know
what to do in the future.

Thanks in advance.

- Dan

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Apr 28 20:08:29 2006