RE: Mergeinfo

Well the problem is that a few files keep having their mergeinfo property changed, so for example if I commit file_1 on branche_2 after a merge, it asks me if I would like to commit file_2 and file_3 as well, although these have not been included in the merge. SO far no real problem, as it could be just a glitch. But at the next merge->commit process, exactly the same files (file_2 and file_3) are marked as "dirty" again and needs to be recomitted. But there has been no change at all on these files........ So why do these two files (and not the 1000 others) keep popping up there?

Best,

Patrick

-----Original Message-----
From: Tyler Roscoe [mailto:tyler_at_cryptio.net]
Sent: donderdag 28 mei 2009 17:16
To: Plaatje, Patrick
Cc: users_at_subversion.tigris.org
Subject: Re: Mergeinfo

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

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2356434

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-05-28 19:40:24 CEST