Dealing with Renamed Directories

I have a dozen outstanding feature branches (based on the trunk), and
I need to rename a subdirectory. Since I've got so many branches, I
want to make sure I'm doing things properly.

Here's how I plan to do this, and propagate the change to the branches:

TRUNK
1. Rename the directory (and commit).
2. Change any code to reflect the new directory name (and commit).

BRANCH
3. Merge in step 1.
4. Resolve the resulting tree conflict with "mine-full".
5. SVN rename the changed directory (and commit).
6. Merge in step 2 (and commit).

Is that the standard approach?

Notes:
 * I don't like how 1 and 2 are separate commits, but it seems inevitable.
 * 3-5 could be done with record-only-merge, but 3-5 seems to have the
advantage that the eventual branch-to-trunk merge will have this merge
revision ignored.

Thanks,
Jamie
Received on 2012-07-17 16:16:50 CEST