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

Re: Cannot reintegrate feature branch

From: Stefan Sperling <stsp_at_elego.de>
Date: Thu, 6 May 2010 13:48:25 +0200

On Thu, May 06, 2010 at 01:36:04PM +0200, Stefan Sperling wrote:
> You want mergeinfo like this:
>
> /branch (svn:mergeinfo = trunk:r50)

Oh, and I'm not implying that you should modify the mergeinfo by hand.
Just do the merge from trunk to the branch again, but with a working
copy at depth infinity. This will make the branch pick up the missing changes.
Then try to reintegrate the branch again.

Stefan
Received on 2010-05-06 13:49:02 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.