[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Merging branches when directory structure has changed

From: Angel Tsankov <fn42551_at_fmi.uni-sofia.bg>
Date: Thu, 6 Mar 2008 19:22:16 +0200


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?

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

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.