RE: mergeinfo properties getting carried around, makes for confusing merges

> Denis Haskin wrote:
> > Is this really normal behavior?
>
> Only if someone performed a special merge on the affected files.
> Most likely it's due to one or more bugs in svn 1.5, which nobody
> seems
> to be able to give a number for. One of them is that "svn copy"
> adds
> empty svn:mergeinfo properties. These then grow with every
> checkout.

This was fixed in 1.5.5 according to the CHANGES log.

However, I would get any clients up to 1.6.6.

If you look at the changes file http://svn.collab.net/repos/svn/trunk/CHANGES and search for "mergeinfo" you will see that almost every release from 1.5.0 to 1.6.6 contains a fix/enhancement of some kind for merging. It is certainly a work in progress.

BOb

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2415811

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-11-09 16:33:41 CET