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

RE: --reintegrate merge problems

From: Geoff Rowell <geoff.rowell_at_varolii.com>
Date: Wed, 3 Jun 2009 14:36:42 -0400

The “TrimMergeInfo.pl” script I recently posted to the user mailing list can be used to trim off the obsolete merge info from the branch.




From: Trent Nelson [mailto:tnelson_at_onresolve.com]
Sent: Wednesday, June 03, 2009 1:47 PM
To: Brian Rieck; dev_at_subversion.tigris.org
Subject: RE: --reintegrate merge problems


This sounds very similar, if not identical, to a problem Ive run into recently:

- Trunk gets self-referential mergeinfo added to it, i.e. /src/trunk:2-115.

- A branch is created from trunk_at_HEAD (lets say HEAD = 389).

- The branch inherits trunks self-referential svn:mergeinfo in the copy.

- This breaks the wazoo out of any subsequent merges to or from trunk; branch was created from trunk_at_389, but Subversion relies on the svn:mergeinfo when its present, rather than consulting the natural history, which results in it trying to apply 116-389 to the branch during the merge.


I can see some self-referential svn:mergeinfo against trunk in your attachments. In my situation, any branch that was created when that mergeinfo was present is completely hosed.





From: Brian Rieck [mailto:BRieck_at_sandcherry.com]
Sent: 02 June 2009 19:19
To: dev_at_subversion.tigris.org
Subject: --reintegrate merge problems




First I hope that it is okay to send attachments to the listsrv and that dev is the right list for this.


We have been having a lot of problems trying to do reintegrate merges back to trunk. Im experiencing some especially odd behavior now. To make the problem as simple as possible I did the following:


1) Create a new branch of of trunk

                svn cp <url to trunk> <url to new branch>

2) Do nothing in the new branch, dont even check it out

3) try to do a merge back to trunk

                Svn merge reintegrate <url to branch> <path to trunk cp>


When doing this I get a ton of conflicts. When I look at the svn status in one of the directories it shows what appear to be tree conflicts. The attached file merge_output_and_status.txt shows the output of the merge command, then I give up and CTRL-C, then a cd to a directory where there were conflicts and the output of svn status in that directory.



Some additional background:


-The most common problems up to now have been that there are missing ranges in the branch mergeinfo. Ive been dealing with that by manually adding the missing ranges to the mergeinfo on the branch.


-We recently moved to 1.6.2, although I wouldnt be surprised if some developers upgraded before the organization officially upgraded. Prior to that wethe server and I assume most of our users were on 1.5.5


-I am fairly certain that some people have been merging to trunk without reintegrate and I wouldnt be surprised if there some folks did some cherrypicking merges back to trunk as well.


-Also attached are two more files - trunk.mergeinfo and trunk.mergeinfo.recursive which show the output of

svn pg svn:mergeinfo $SVN_TRUNK




svn pg svn:mergeinfo --recursive $SVN_TRUNK


The output is quite different between the two. The same commands run on the http://svn.collab.net/repos/svn repository yield identical results.



Any and all help much appreciated.






This email and any files transmitted with it are confidential and intended solely for the use of the individual or entity to whom they are addressed. If you have received this email in error please notify the sender.

Received on 2009-06-03 20:37:49 CEST

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

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