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

--reintegrate merge problems

From: Brian Rieck <BRieck_at_sandcherry.com>
Date: Tue, 2 Jun 2009 12:19:10 -0600



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. I'm 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, don't even check it out

3) try to do a merge back to trunk

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


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. I've 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 wouldn't 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 wouldn't 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.




Received on 2009-06-03 02:19:53 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.