[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: Stein Somers <ssomers_at_opnet.com>
Date: Thu, 24 Sep 2009 13:01:54 +0200

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.

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-24 13:02:46 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.