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

RE: Reintegrate issue with v1.6.5

From: Bob Archer <bob.archer_at_amsi.com>
Date: Fri, 4 Sep 2009 12:23:58 -0400

> I'm experiencing the following reintegrate error when trying to move a
> feature branch back to trunk. (this is the output from TortoiseSVN):
> Error: Reintegrate can only be used if revisions 320 through 364 were
> previously
> Error: merged from svn://server/project/trunk to the reintegrate
> source, but
> Error: this is not the case:
> Error: branches/DEV_BRANCH/folder1
> Error: Missing ranges: /trunk/folder1:320-361
> Error: branches/branchname/folder2
> Error: Missing ranges: /trunk/folder2:320-361
> I've removed identifying information because of company policy, but the
> names here indicate where I am in the repository. I'm trying to
> reintegrate
> DEV_BRANCH to trunk.
> I've found references here:
> http://svn.haxx.se/users/archive-2009-03/0136.shtml
> where Mark Phippard suggested using the record-only option to fix the
> mergeinfo on DEV_BRANCH. I attempted to merge R320-361 from trunk to
> my dev
> branch and recommit (this created R362). I can see the updated
> mergeinfo.
> However, the reintegrate merge still fails in the same way, with TSVN
> now
> complaining about R320-362 in folder1 and folder2.

Hmm... is there mergeinfo on DEV_BRANCH/folder1 and DEV_BRANCH/folder2? If so, they will need to include the range 320-361 also. When you did you record-only merge did it update mergeinfo on folder1 and folder2? Another thing you could do is remove the merge info from DEV_BRANCH/folder1 and DEV_BRANCH/folder2 making sure that all the merge info is on the DEV_BRANCH folder.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-04 18:25:35 CEST

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

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