Re: Merging branches when directory structure has changed

On Mar 6, 2008, at 11:22, Angel Tsankov wrote:

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

You will probably have great problems performing such a merge. My
advice is that if parallel development of trunk and branch(es) will
take place, no rearrangement / renaming should be taking place,
because of this problem.

---------------------------------------------------------------------
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-07 08:40:15 CET