I am having a problem using the reintegrate functionality of SVN, and would
greatly appreciate some help. We recently upgraded from SVN 1.4.x to 1.6.1
and I was excited to take advantage of SVN's new merge capabilities. Here
is what I did:
1) Created a new "feature" branch with "svn copy ^/trunk
^/branch/mybranch" and made changes in that branch
2) From a mybranch working directory ran "svn merge ^/trunk"
3) Resolved conflicts and commited change
4) Change to trunk working directory and ran "svn merge --reintegrate
^/svn/branch/mybranch"
The last command gives me errors in the format:
/branch/mybranch/directory
Missing ranges: /loc/main/admin_cmds:<branch create revision>-<current
trunk revision>
/branch/mybranch/directory/subdirectory
Missing ranges: /loc/main/admin_cmds:<branch create revision>-<current
trunk revision>
/branch/mybranch/directory/file.c
Missing ranges: /loc/main/admin_cmds:<branch create revision>-<current
trunk revision>
The items that produced errors had their svn:mergeinfo modifed by the merge
command, but there are only entries for other branches (there is no
/trunk:RANGE
entry). I have searched for a solution to this, and it looks like other
people have had similar problems, but I have not been able to grok what is
going wrong and how to fix it. Most notably someone asked for help with the
same error a month ago:
http://subversion.tigris.org/ds/viewMessage.do?dsMessageId=2359090&dsForumId=1065.
The problem there was described as being caused by having subtree mergeinfo
that shouldn't be present, and the suggested solution was to "manually
remove all the subtree mergeinfo." So, a few questions:
1) What can I do to successfully reintegrate my /branch/mybranch at this
point? (How do you manually remove subtree mergeinfo?)
2) What is different about the items that are causing errors errors? (Why
am I getting this subtree mergeinfo on these items?)
3) What can I do to make this process smoother going forward?
4) What is the format for svn:mergeinfo? What is the best resource for
getting an in depth understand of how this stuff works?
Thank you so much for any information!
-Lenza
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2370822
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-07-13 07:07:10 CEST