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

reintegrate problem

From: Ruslan Sivak <russ_at_vshift.com>
Date: Wed, 04 Mar 2009 17:27:15 -0500

I think I've found another 1.5 bug related to reintegrate...

Some time ago we created a branch called v2. There were a lot of
changes done to this branch, with some merged back to trunk and some
changes merged to the branch from trunk. So far so good.

Now I would like to fully catch up to the trunk. I follow the
instructions here: http://blog.red-bean.com/sussman/?p=92

$cd workingcopy
$svn merge trunkURL

Merge tells me that there is a conflict which I choose to resolve
later. It then tells me that since there were conflicts it will not do
the next part of the merge and tell me to rerun the merge once the
conflicts are fixed.

I fix the conflict, rerun the merge and it finishes successfully. So
far so good.

I now commit these changes to v2, and switch to trunk.
$svn commit
$svn switch trunkURL
$svn merge --reintegrate branchURL
svn: Reintegrate can only be used if revisions 352 through 556 were
previously merged from trunkURL to the reintegrate source,
but this is not the case:
    Missing ranges: /trunk/somefolder:432

Looking at the history, it seems like there is a somefolder/somefile.ext
which was added to /branches/v2 in revision 386 and then a developer
copied that folder to trunk (using the filesystem copy command) in
revision 432.

I guess the merge code that did the merge from trunk saw that there was
a conflict, but that the changes were the same, so it just added the
svn:mergeinfo of /trunk/somefolder:433-555, so now reintegrate thinks
that that folder wasn't fully merged previously.

Hopefully this gives enough information to reproduce the bug.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-03-04 23:28:33 CET

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

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