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

RE: Merge reintegrate error

From: Bob Archer <bob.archer_at_amsi.com>
Date: Wed, 14 Oct 2009 13:09:38 -0400

>We're having problems merging a branch back to trunk. The trunk contains no mergeinfo at all because I removed it via svn propdel. The only mergeinfo the branch contains is on the root directory. Neither root nor branch has local modifications. Here's what happens:
>
>$ cd ~/branch
>$ svn propget svn:mergeinfo -R .
>. - /trunk:28608-29675
>$ cd ~/trunk
>$ svn propget svn:mergeinfo -R .
>$ svn merge --reintegrate https://myserver/branch/
>svn: Reintegrate can only be used if revisions 28608 through 29679 were previously merged from
>https://myserver/trunk to the reintegrate source, but this is not the case:
> branch/workflow/src/definition/whoisoptout
> Missing ranges: /trunk/workflow/src/definition/whoisoptout:29575-29675
> branch/workflow/src/mail/templates/whoisoptout
> Missing ranges: /trunk/workflow/src/mail/templates/whoisoptout:29575-29675
> branch/workflow/test/definition/whoisoptout
> Missing ranges: /trunk/workflow/test/definition/whoisoptout:29575-29675
>
>Why does it think there are missing ranges if there is no current mergeinfo to that effect? Where else does it get this information?

It tells you right in the message. You must have merge info on /branch/workflow/src/definition/whoisoptout and it doesn't include everything that the branch folder includes.

CD into the branch and do an svn merge $REPO/trunk to ensure that all the changes from trunk are merged to ALL the folders and subfolders in /branch.

BOb

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2407652

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-10-14 19:10:37 CEST

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