Merging branches when directory structure has changed

Hallo.

I have been working on a branch for quite a while. In the meantime the
directory structure of the trunk has been changed (via TortoiseSVN's rename
command, i.e. history has been preserved). Now I wonder if the changes in
the branch can be merged to the proper files in trunk. What if the files (or
directories) have been also renamed in the branch?

Regards,
Angel Tsankov

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-03-06 18:32:01 CET