On Jan 9, 2010, at 7:58 AM, Geoff Rowell wrote: > I follow a few rules to avoid this: > 1) Remove obsolete merge info as part of the branch creation process > (svn pd -R svn:mergeinfo /my/branch).
I don't do that regularly (but have done it once or twice), but from my understanding, that fixes the "problem"/annoyance where existing subtree mergeinfo gets updated every time a merge is done, even if the merge doesn't affect the files with mergeinfo. That's not the same issue as what I'm seeing though; in my case, mergeinfo is being created on files that didn't have it before. > 2) Only allow recording of merge info at the root level. This means > that all merges must take place to and from the root of branches and > the trunk. (In fact, a pre-commit hook prevents saving merge info > anywhere else.) I do always merge at the root. > 3) Remove merge info from trunk when a branch is no longer under > active development. This also seems to address the issue of updates on existing mergeinfo, but not creation of new mergeinfo.
