[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Missing ranges. Cannot merge back to trunk from branch

From: Paul Lester <paul.lester_at_aig.com>
Date: Thu, 29 Jan 2015 06:21:04 -0800 (PST)

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
 to the reintegrate source, but this is not the case:
    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!


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

This is an archived mail posted to the TortoiseSVN Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.