Merge tracking problem

Hello everybody,

I have a problem with the merge tracking in Subversion. The software configuration is as follows:

- Server: VisualSVN server 1.5.1 running on a Windows Server 2003

- Client type 1: TortoiseSVN, on Windows XP and Vista machines

- Client type 2: Subclipse, in Eclipse Ganymede, on Windows and Linux machines

Our project is located in a Subversion repository which has been created some years ago. So to say, the repository was there before Subversion supported merge tracking. The server and repository have been upgraded in 2008 to the 1.5 version. Since then, the tracking was working just fine: developers working on branches merged changes from the trunk into their branches and the clients showed that the merged revisions had already been merged.

However, things no longer work so well since (for the first time since the upgrade) a branch has been reintegrated into the trunk. The reintegrate of that branch itself worked without any problems, using the reintegrate feature. But now we get strange errors when trying to reintegrate any other branch. SVN complains about some versions not having been merged into the branch. For instance, a branch created 6 months ago cannot be merged because SVN claims that it misses revisions from another branch which was created 2 years ago and reintegrated 1.5 years ago (that is, the branch created 6 months ago does already contain all those changesets). The same happens with newer branches (2 months old) which have received changes from trunk by merging: SVN claims that they cannot be reintegrated due to missing changesets, even though all changes on the trunk have been merged into the branch.

I already figured out that something is wrong with the svn:mergeinfo property. The trunk did not have any such property until the aforementioned first reintegrate of a branch. Since then, it has the property, though it does not list up every reintegration of branches (missing especially those performed using 1.4.x clients).

Now the question is: how do I fix this such that reintegrating branches becomes possible again? I already tried the following: for the error message

Error: Reintegrate can only be used if revisions 4082 through 4304 were previously

Error: merged from

Error: https://servername:port/svn/repository/trunk to the

Error: reintegrate source, but this is not the case:

Error: branches/ude_xml_merge

Error: Missing ranges: /trunk:4100-4105,4292-4294

I tried to simply merge from trunk revision 4082 to revision 4304 into the branch (that is, specifying this as a parameter for the merge; all the changesets from that range had already been merged into the branch). That did not change any file content, but fixed the svn:mergeinfo property for most of the files. However, it left the property of a few files unchanged, and so the problems remain. Is there any way of forcing SVN to consider these files as having been merged?

Best regards

Dominique Gückel

--
Dipl.-Inform. Dominique Marcel Gückel
RWTH Aachen, Lehrstuhl Informatik 11 - Software für eingebettete Systeme
Ahornstraße 55, 52074 Aachen
fon: +049 0241 80 21168
fax: +049 0241 80 22150
mail: gueckel_at_informatik.rwth-aachen.de
web: http://www-i11.informatik.rwth-aachen.de
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1611350
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].