SVN reintegrate branch - Removing svn mergeinfo

 

http://stackoverflow.com/questions/4737605/reintegrate-can-only-be-used-if-revisions-were-previously-merged-url-to-reintegr

 

If you get an error like this when reintegrate merging from branch to trunk:

svn merge --reintegrate svn+ssh://svn/usr/local/svn/repos/all/branches/2.7

svn: Reintegrate can only be used if revisions 18765 through 18921 were

    previously merged from svn+ssh://svn/usr/local/svn/repos/all/trunk to the

    reintegrate source, but this is not the case:

branches/2.7/proj/src/main/java/com/foo/furniture.java

Missing ranges: /trunk/proj/src/main/java/com/foo/furniture.java:18765-18920

 

 

Do this on branch:

svn propget -R svn:mergeinfo .

svn propdel svn:mergeinfo proj/src/main/java/com/foo/furniture.java ...

svn commit -m 'removed mergeinfo' proj/src/main/java/com/foo/furniture.java ...