Re: reintegrate problem

On Wed, Mar 04, 2009 at 05:27:15PM -0500, Ruslan Sivak wrote:
> 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.

So you've merged changes both ways.
You cannot use --reintegrate anymore.

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

These instructions only merge changes one way before reintegrating.

The problem you are seeing is not a bug.
It's a problem enforced by Subversion's design, and is explained here:
http://blogs.open.collab.net/svn/2008/07/subversion-merg.html

Stefan
Received on 2009-03-04 23:47:38 CET