How can I reintegrate an already reintegrated and rolled-back branch in SVN? <p>We did following ugly thing:</p> <p><img src="https://i.stack.imgur.com/qjVOP.png" alt="svn history"></p> <p>So, how can we achieve another <code>reintegrate</code>?</p> <p>What did I try so far?</p> <ul> <li>well, the obvious merge - which fails brutally!</li> <li>creating a patch and apply it to <code>trunk</code> (which should work, as it diffs the files with no svn only...)</li> <li>creating another branch @ trunk r101 and merge all the changes from first branch - fails brutally :)</li> </ul> <p><strong>edit:</strong></p> <p>merge-infos for trunk do not show any merged revisions of the desired branch (as I've rolled them back with r101)</p>