Merging failures

[joel]

Our group has had several instances of merges failing with the following error:

FailInvalidRevision

In addition, it seems that the merge tool doesn't always pick up recursive folder changes. For example, one of our merges involved an empty top-level folder with several levels of subfolders that contained file changes. The merge tool ignored the all changes except for just creating the first level of subfolders. Have you seen any errors like these before? Please give guidance.

Thanks,
Joel

[dan]

Our group has had several instances of merges failing with the following error:

FailInvalidRevision

Where is this being reported - in a screen of the Merge Branches wizard, or in the GUI client?

In addition, it seems that the merge tool doesn't always pick up recursive folder changes. For example, one of our merges involved an empty top-level folder with several levels of subfolders that contained file changes. The merge tool ignored the all changes except for just creating the first level of subfolders. Have you seen any errors like these before? Please give guidance.

The first place to look for these kinds of errors is to verify that the versions selected in the wizard (to apply changes from origin to target) do actually span all the actions required to create all the files. Were the files that were added in origin added in one operation, or where they added in different transactions, and were all transactions included in the versions selected?

If that checks out, see if you can reproduce the problem on as small a subset of the tree as you can, and send that in (note - the file contents can be anything - merge branch problems are never on merging the contents of the files, but usually in the structure of the tree, and the types of changes made).