Re: Merging a branch back to trunk produces more changes than previewed (commit would perform a LOT of changes)

Stefan M. Huber wrote:
> I'll now...
> * upgrade clients and server to the latest version
> * upgrade the repository to 1.6
> * reintegrate the branch and do the commit

I'm not sure this will clean up all stray svn:mergeinfo. If you only merge
complete branches and not individual files or subfolders, or at least you
don't need to have the latter recorded, you can remove all svn:mergeinfo
properties like this:

        svn propdel svn:mergeinfo -R
        svn revert .

I did this often in the time svn:mergeinfo kept popping up everywhere and it
always straightened out useless updates.

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