When SVN with merge tracking works, it's really nice, I love it. But it keeps getting twisted up. We are using TortoiseSVN. We continuously get the following message:

> 
> Error: Reintegrate can only be used if revisions 1234 through 2345 were previously merged from /Trunk to the reintegrate source, but this is not the case
> 
> 
> 

For reference, this is the method we are using:

1. Create a Branch
2. Develop in the branch
3. Occasionally **Merge a range of revisions** from the Trunk to the Branch
4. When branch is stable, **Reintegrate a branch** from the branch to the trunk
5. Delete the branch

I **Merge a range of revisions** from the trunk to the branch (leaving the range blank, so it should be all revisions) just prior to the reintegrate operation, so the branch should be properly synced with the trunk.

Right now, the Trunk has multiple SVN merge tracking properties associated with it. Should it? Or should a Reintegrate not add any merge tracking info?

Is there something wrong with our process? This is making SVN unusable - 1 out of every 3 reintegrates forces me to dive in and hack at the merge tracking info.