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.

> It's possible that in the past someone (maybe even me) wasn't consistent
> with doing merges without+with --ignore-ancestry. Could that have
> caused this?

I don't know, I never use ignore-ancestry.

> Can I get rid of this behavior maybe
> by deleting all the mergeinfo properties from all files

Yes. For instance,

        svn propget svn:mergeinfo . > some_temporary_file
        svn propdel svn:mergeinfo -R
        svn propset svn:mergeinfo . -F some_temporary_file

While you're at it, also remove other properties erroneously added, like
bugtraq:url, svn:ignore...

-- 
Stein
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2415810
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].