We have a branch where development has been taking places, and we have been merging changes from the branch into the trunk periodically. Whenever I did a merge, and clicked Show Log on the branch, the already-merged revisions were grayed out. Then we had to rename the branch. Now when I go to do a branch-to-trunk merge using the new branch location, the revisions are not grayed out.
Now at this point, the obvious thing to note is that the mergeinfo properties in all the trunk files still reference the original branch path, so in a way it kind-of made sense for the merge tool to not gray the items out. My thought at this point was to do a another merge from the newbranch, using the exact same set of revisions that had been previously merged from the old branch, and check the Only record the merge option. My assumption was that this would add a new line to mergeinfo that includes the new branch path and the same set of revisions. But this didnt happen; it left the mergeinfo alone. So my suspicion is that the svn library itself is correctly detecting that those revisions have already been merged before and skipping them. But if this is the case, then the Tortoise merge tool ought to detect this as well and gray out the revisions.
Is this is bug in Tortoise? Or is there some other way I can resolve this issue on my end? I thought about writing a script that changes all the mergeinfo properties, but that seems risky.
Thanks
-CSantora
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2824256
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-08-18 23:08:13 CEST