Quick Tip: Fixing “Cannot reintegrate into a working copy not entirely at infinite depth” in Subversion
When attempting to re-integrate a feature branch into a trunk in my Subversion repository, I was getting a weird “Cannot reintegrate into a working copy not entirely at infinite depth” error.
To fix this, I had to fix two problems.
First, my working copy was very “old.” Like, two years of sitting on my desktop old. And I had upgraded Subversion since that time. Apparently, something was not happy with this, particularly related to some new checkout option not being set. So I created a new directory and made a fresh checkout, specifying the “Fully recursive” option in TortoiseSVN.
When I did this, I got a new message: “Retrieval of mergeinfo unsupported.” Still an error, but different!
I had upgraded my Subversion server to 1.6, but I never actually upgraded my repositories to the latest version, which was created way back in 1.4. So I had been operating in a kind of backwards-compatibility mode for two years. Whoops.
Running svnadmin upgrade c:\path\to\my\repo on the server fixed this right up. I also ran the recommended svn-populate-node-origins-index.exe program, which I’m sure did something magical.
Now I can complete the merge successfully in TortoiseSVN. Hope this helps someone.
Hey Nicholas! Recreating the local trunk copy did the magic for me. Thanks for the tip ;)
Thanks, from Taiwan, Nicholas! Like Fred, the new checkout solved it for me!
But, since my original working copy has some extra stuff in it, I went back to using that area. If I do another merge, I may run into this problem again. I wish there was a simple way to ‘refresh’ my working copy (I already tried update and that did not help).
Thanks for writing this up! I had the exact same issue, and the procedure you describe fixed it very cleanly.
I fixed this problem with “svn update –set-depth=infinity”.
@Steve B
Thanks for that tip! Probably easier than re-checking out.
calling “svn update –set-depth=infinity” fixed it for me too.