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

Pat Farrell wrote:
> Bob Archer wrote:
>>> 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.
>
> can you be a bit more specific on what "that" was?

I'm sure he meant the generation of spurious mergeinfo. Once it's there,
it won't go away by itself. It's impossible for svn to remove all
spurious mergeinfo for you, because it looks exactly like you intended
it to be there after having performed a special merge. As far as I
understand elision, and barring there are no bugs, if you were to merge
all branches already merged again (those recorded as mergeinfo in the
working copy top), the spurious mergeinfo should be "elided" away. And
of course no other changes should occur, since you only merge what was
already merged.

Obviously, if you have a lot of branches alive, and you know you have
not done special merges, removing the spurious mergeinfo yourself is
quicker.

> But, svn propdel svn:mergeinfo -R fails
> svn: Attempting to delete nonexistent property 'svn:mergeinfo'

That's a good sign: there is no mergeinfo on the target folder or any of
its children anymore. Just commit and your merge issues should be over
and never return.

Do note that you don't want to delete svn:mergeinfo on the working copy
top folder, which seem to be /bbook/branches/pat or /bbook/trunk/trunk
in your case.

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