On Fri, Sep 09, 2011 at 12:17:15PM -0400, David Carson wrote:
> To that end, I installed 1.7.0-rc2 with a snapshot of our repository, so I
> could experiment and see for myself. I did a simple merge from one branch
> to another. I was disappointed to see that the same miscellaneous group of
> files and directories below the top-level are having their snv:mergeinfo
> modified, even though they do not participate in the change. I guess I am
> not reading the documentation for 1.7 correctly, because I thought that this
> was one of the major changes; namely, that any object which is not affected
> by the merged changes would not have its svn:mergeinfo property changed.
Did the change you were merging contain svn:mergeinfo property changes?
If so, those will be applied to the working copy.
If the revision rN you are merging from 1.2 into 1.3 was itself the
result of a merge, and this merge was done with a 1.6 client,
this would explain the problem.
Received on 2011-09-09 18:39:38 CEST