Hello,
I am aware that this is a much asked question, but since I have nonetheless been
unable to find an answer which quite works for me I will ask it again. Feel
free to point me to a FAQ I have missed by way of answer if appropriate!
We have a large project with multiple branches versioned with Subversion (most
of us are using 1.6 clients at the moment). There is a lot of merging done
between branches, and it has happened on numerous occasions that merging has
been done to branch (or trunk) subtrees which should have been done to the
branch root - in fact, no merge should ever have gone to a subtree. The obvious
result is unwanted mergeinfo changes blossoming through the tree (though even
that is not quite consistent, as people sometimes do not commit mergeinfo
changes on subtrees, and I am sure that a few have been omitted which perhaps
should not have been). I have been looking for a way to clean things up -
basically, to determine for a given branch all changesets which have been merged
to it, to set that information on the branch root and remove (or let Subversion
elide) the information on the subtrees. So far I haven't found a good solution,
and in particular I have been defeated by things like finding 71874-75960 in the
mergeinfo because only change 71874, 75960 and a few in-between applied to a
particular subtree. (Would Subversion 1.6 even handle elision correctly here?)
I would be very grateful for suggestions about how to clean this up as
automatically as possible if this is even feasible!
Many thanks,
Michael
By the way, I am not subscribed to this list, but I will monitor it for a few
weeks for responses.
Received on 2012-09-19 15:15:38 CEST