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