On Thu, May 28, 2009 at 03:20:02PM +0200, Plaatje, Patrick wrote:
> I have 1 development trunk and 2 seperate branches. Besdies that we
> have two different development workflows present:
>
> 1. This development process is setup that changes are being made in
> Branch_1, which are being merged to the trunk and from the trunk being
> merged to Branch_2.
>
> 2. In this process development is being done in the trunk and merged
> to the Branch_2 (the step of merging from the Branch_1 is not
> present);
>
> The problem now is that (and I'm not sure where it originated) that
> when I do a merge to (a completely up to date) Branch2 from the trunk
> it merges just fine, but when I want to commit my changes there are
> more dirty files then I merged. It looks like that the other files
> just have their mergeinfo propery modified.
There are a number of scenarios where this might happen. Subversion is
trying to keep track of which changes from branch1 and trunk have
already been merged to branch2 so that it doesn't later try to merge
those changes again and cause chaos.
What exactly is your question?
tyler
Received on 2009-05-28 17:18:07 CEST