Missing ranges. Cannot merge back to trunk from branch

I get the following error when trying to merge changes from the main branch, PHOENIX_MAIN into our development branch, Q1_2015_ISO_CRIME

Auto-merge .../PHOENIX_MAIN/chartis into C:\Q1_2015_ISO_CRIME\chartis
Reintegrate can only be used if revisions 27840 through 28422 were previously
 merged from
 http://vmlivxdchar0051.r1-core.r1.aig.net/svn/eWS_FrontEnd/Branches/Q1_2015_ISO_CRIME/chartis
 to the reintegrate source, but this is not the case:
  Branches/PHOENIX_MAIN/chartis
    Missing ranges: /Branches/Q1_2015_ISO_CRIME/chartis:28242

I looked into the log and see that revision 28242 was the last merge from trunk that we did. We actually merged the results of that merge back to the trunk, so there is nothing to merge.

I need to be able to do another merge from the trunk, but am not sure how to make this happen. I'm pretty new to SVN, though not to source control.

We are using Tortoise tortoise svn 1.8.7 build 25755 and Subversion 1.8.10.

Thanks, in advance, for your help!

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3095295

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-01-29 17:23:50 CET