Mergeinfo

Hi all,

I know that this subject has been discussed reasonably well already and I tried to figure this out, but am not sure what is causing the current issues I'm having. The problem is as follow:

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.

Any clues/ideas?

Thanx,

Patrick

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-05-28 15:23:29 CEST