> I am running into the error: > > svn: Cannot reintegrate from 'url://feature-branch' yet: > Some revisions have been merged under it that have not been merged > into the reintegration target; merge them first, then retry. > > I came across a collab.net blog site[1] that referenced this issue. So I > tried it in 1.6.6 too, which gave me a little more information - namely, > one path in my branch seems to be missing a revision from trunk. In > examining the svn:mergeinfo, it seems to be an 'off-by-one' - the > svn:merge info records 5627:6031 as being merged but not 5626. I synced > the branch using a 1.5.1 client; and running svn diff url-trunk url-branch > produces only a delta in the svn:mergeinfo; so I am assuming the files are > identical. > > The merge revision in question adds a folder and file. > > Reading more of the blog points to a forum[2], and following that I found a > post[3] that references doing a record only merge, which I tried (using a > 1.6.6 client), but it didn't seem to resolve the 'off-by-one' issue.
> > So, is it: > > i) safe to just delete the svn:mergeinfo in this case? > ii) is is safer/better to just 'svn pedit svn:mergeinfo' to include the > extra revision? (e.g. edit 5627:6031 -> 5626:6013) > > Would 'ii' even work? If so, which is (a) better, (b) safer? > > I kind of lean towards 'i' since (1) it seems to be documented, and (2) the > files do seem to be the same. But I'd like to understand this a little more > before I do something. > > TIA, > > Ben > > [1]http://blogs.open.collab.net/svn/2008/07/subversion-merg.html > [3]http://subversion.open.collab.net/ds/viewMessage.do?dsForumId=4&dsMessag > eId=99955 How did you try the record-only merge? I already had this kind of issue and record-only merges have always worked for me. Arpad Ilia
