Merging folders

[isuhigh]

I created a subfolder under a branch folder (folderB). When I attempt to merge from folderB to the original folder (folderA), the subfolder is not created in folderA. Merging for files seem to work fine but there seem to be a problem with merging new subfolders. Is this a limitation of the merging feature or am I doing something wrong? I'm using version 2.0.6.

[ericsink]

I created a subfolder under a branch folder (folderB). When I attempt to merge from folderB to the original folder (folderA), the subfolder is not created in folderA. Merging for files seem to work fine but there seem to be a problem with merging new subfolders. Is this a limitation of the merging feature or am I doing something wrong? I'm using version 2.0.6.

This is supposed to work, so either you are "doing something wrong" or you have found some sort of a bug.

Can you tell us more details on exactly what you did?

[ericsink]

Talking to this person offline, this turned out to be "Enabled User Error" . In other words, the user was doing it wrong, but the app's UI was encouraging him to do it wrong, so the real blame lies with the app.

In the Merge Branches wizard, there is a screen which requires the user to select two revisions which determine which changes are to be migrated from the origin to the target. This screen is extremely confusing. It has been improved for the upcoming 3.0 release.