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

Merge reintegrate error

From: Ed Wiles <edward.wiles_at_gmail.com>
Date: Wed, 14 Oct 2009 14:55:35 +0100

Hello,

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?

I'm using a 1.5.7 client and the server is 1.5.5.

Thanks

Ed

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

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

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