Subversion 1.5 about reintegrate and renames

Hello!

I've installed the collabnet build for RC9 on my windows host. I followed the instructions in the Subversion Book, though, the first thing I tried failed. :

1. I've created following structur

 branches
 tags
 trunk
    |
   +- file1.txt
    |
   + file2.txt.

2. I've created a branch by coping /trunk to /branches/a

3. moved file1.txt to file3.txt

4. merged /trunk into /branches/a

5. then, I tried to reintegrate the branch to the trunk:

d:\temp\subversion-1.5-repo\checkout\test\trunk>svn merge --reintegrate file:///d:/temp/subversion-1.5-repo/test/branches/a
svn: Cannot reintegrate from 'file:///d:/temp/subversion-1.5-repo/test/branches/a' yet:
Some revisions have been merged under it that have not been merged
into the reintegration target; merge them first, then retry.
I'm not sure if this problem is related with http://subversion.tigris.org/issues/show_bug.cgi?id=3128.

However, this is for me common usecase for functional branches and must find a solution for it. I've been surfing around a bit, though, I haven't understood the actuall problem yet. Merge:info looks allright to me.

Does anybody know a workaround or best practice for reintegrating branches back to the trunk? What's the roadmap to fix this problem?

Thanks

Kuno
Received on 2008-06-26 20:23:32 CEST