[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: Jean Seurin <jean.eastcode_at_gmail.com>
Date: Mon, 10 May 2010 12:08:15 +0800

Hi Stefan,

mergeinfo properties are exactly as I mention for the file causing problems:

all and only the 5 files concerned with the problem have been commited
after a merge from the trunk, empty of modification, but with the
mergeinfo properties modified as follow:
added line
/branches/project-1.13/pathToFile:6266-6372

This comes from a merge done on the trunk from a Release branch, which
in turn made its way to the Feature branch in question.

The operation seem regular to me. The question is why only those 5 files
have add the mergeinfo added?
All the other files commited in the trunk as part of the same merge from
the Release branch didn't get their mergeinfo updated.

cheers
jean

Stefan Sperling wrote:
> On Fri, May 07, 2010 at 11:35:16AM +0800, Jean Seurin wrote:
>
>> Hi Stefan,
>>
>> unfortunately even with a fresh branch check out, it would not pick
>> up the missing changes, that is the problem.
>>
>
> Can you try to find out why it would merge the remaining changes?
>
> I don't think anyone can help you debug this remotely without
> knowing what your mergeinfo really looks like.
> Maybe you can pin-point the problem yourself by looking at
> mergeinfo? Using commands like svn mergeinfo, and if necessary
> looking at mergeinfo properties directly should provide clues.
>
> Stefan
>
Received on 2010-05-10 06:09:00 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.