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

Solution: Some revisions have been merged under it that have not been merged into the reintegration target

From: Alexander Orlov <alexander.orlov_at_loxal.net>
Date: Sun, 26 Apr 2009 14:57:43 -0700 (PDT)

On Mar 17, 12:24 pm, Robin Guest <robin.gu..._at_gmail.com> wrote:
> > Long story: This error used to be raised when you have svn:mergeinfo
> > properties on any files or folders in your branch, not including the
> > merge source (AKA "it").

Right :)

Just go into the root directory of your SVN copy and execute:

svn -R pd svn:mergeinfo ./
svn ci -m "svn:mergeinfo property DELETED from everywhere"

cd to your trunk WC
Afterwards you should be able to execute commands like:

svn --reintegrate --dry-run merge ../../branches/
my.branch.which.should.be.integrated.in.trunk

...from your trunk WC.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1934895

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-04-27 07:03:19 CEST

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