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

unable to reintegrate branch

From: Manny DaSilva <manny390_at_yahoo.com>
Date: Thu, 11 Mar 2010 15:19:10 -0800 (PST)

Server at v1.6.9
CollabNet command-line client at v1.6.9
TortoiseSVN client at v1.6.7
1. Trunk copied to branches/X
2. Shallow checkout of branches/X creates sparse working-copy:
X/A
X/B
3. update --set-depth infinity X/A downloads additional folders from X/A tree:
X/A/1
X/A/2
X/A/3
3. merge --depth infinity <ReposURL>/trunk
The merge works correctly but causes svn:mergeinfo properties like
the following. Note the asterisked rev number in svn:mergeinfo:
/trunk/A:199-202*
/trunk/B:199-202*
4. Using E:\X41\trunk fully recursive working copy of trunk, run:
merge --reintegrate <ReposURL>/branches/X
Get this error:
Command: Reintegrate merge <ReposURL>/branches/X into E:\X41\trunk
Error: Reintegrate can only be used if revisions 199 through 204 were previously
Error: merged from <ReposURL>/trunk to the reintegrate source, but this is
Error: not the case:
Error: branches/X/A
Error: Missing ranges: /trunk/A:199-202
Error: branches/X/B
Error: Missing ranges: /trunk/B:199-202

Any ideas as to what may be causing these errors?

      
Received on 2010-03-12 00:23:13 CET

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