ShadowMage Posted August 17, 2012 Share Posted August 17, 2012 (edited) I am trying to reintegrate a feature branch back into the trunk, but I keep getting the following errors: Error: Reintegrate can only be used if revisions 107 through 185 were previously Error: merged from file:///C:/VersionControl/Repositories/SkyPrice/trunk to the Error: reintegrate source, but this is not the case: Error: branches/MarkupToggle/Forms Error: Missing ranges: /trunk/Forms:139,174 Error: branches/MarkupToggle/Scripts Error: Missing ranges: /trunk/Scripts:139,174,180 Error: branches/MarkupToggle/SkyPriceHome.php Error: Missing ranges: /trunk/SkyPriceHome.php:139 Error: branches/MarkupToggle/SkyPriceLayoutStyle.css Error: Missing ranges: /trunk/SkyPriceLayoutStyle.css:139,174 What do these errors mean and how can I resolve them so that I can reintegrate my branch? I am using TortoiseSVN. Thanks for your help. EDIT:I tried to do a revision range merge as well, but I get a conflict on the properties of one of my files. The conflict message is:Could not add property 'svn:mergeinfo' on 'SkyPriceHome.php' because it is already deleted. If I click the "Edit conflict" button, the editor shows up comparing the two property files, but there is absolutely no difference between the new one and the old one. So where's the conflict? Is it safe to just use one or the other and ignore the conflict? Edited August 17, 2012 by ShadowMage Link to comment Share on other sites More sharing options...
Create an account or sign in to comment
You need to be a member in order to leave a comment
Create an account
Sign up for a new account in our community. It's easy!Register a new account
Already have an account? Sign in here.Sign In Now