Re: Surprising merge results - Mergeinfo Elision?

David Aldrich <david.aldrich_at_eu.nec.com> writes:

[mail formatting repaired - lines should be <80 characters]

> I am using a GUI svn client based on SVNkit 1.3.1, which I believe is
> aligned with svn 1.6.5 approx, and svn server 1.5.2.
>
> I have just merged changes from my project's trunk into my branch and
> am surprised to see that I have 100 files showing a local state of
> 'Modified (properties only)'. If I examine the changes I find that the
> only change on each of these files is that the svn:mergeinfo property
> has been removed.

I suspect this is the client cleaning up redundant subtree mergeinfo.
Ask yourself if the effective mergeinfo for those files matches before
and after the removal.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].