[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: Srilakshmanan, Lakshman <lakshman.srilakshmanan_at_police.vic.gov.au>
Date: Thu, 15 Oct 2009 10:49:26 +1100

Hi Ed,
 
Firstly, you should have the following structure
/branches
/tags
/trunk
 
Secondly, you should have a branchName under branches.
ie <https://myserver/branches/> https://myserver/branches/
<https://myserver/branches/Issue765> Issue765
 
Issue765, should be a copy of trunk.
 
 
finally, it appears that there are changes in trunk that don't exist in
branch.
>> $ svn propget svn:mergeinfo -R .
>> . - /trunk:28608-29675
 
The above mergeinfo states that you have merged r28608-29675 from trunk
 
>> svn: Reintegrate can only be used if revisions 28608 through 29679

The above error message suggests that trunk has moved on from 29675 and
is currently at 29679.
 
I recommend that you merge trunk/HEAD to your branch, commit the change
into branch and then --reintegrate back into trunk.
 
Thanks
Lakshman

________________________________

From: Ed Wiles [mailto:edward.wiles_at_gmail.com]
Sent: Thursday, 15 October 2009 12:56 AM
To: users_at_subversion.tigris.org
Subject: Merge reintegrate error

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

================================================================================================
EMAIL DISCLAIMER

This email and any attachments are confidential. They may also be subject to copyright.

If you are not an intended recipient of this email please immediately contact us by replying
to this email and then delete this email.

You must not read, use, copy, retain, forward or disclose this email or any attachment.

We do not accept any liability arising from or in connection with unauthorised use or disclosure
of the information contained in this email or any attachment.

We make reasonable efforts to protect against computer viruses but we do not accept liability
for any liability, loss or damage caused by any computer virus contained in this email.
================================================================================================

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

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

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