On Mon, May 10, 2010 at 12:08:15PM +0800, Jean Seurin wrote:
> 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.
I'm afraid I still think I'm not getting the whole picture, which
makes it hard to understand the problem and help you solve it.
You're giving us hints about what changed in the mergeinfo, but you
aren't providing a complete picture of what the mergeinfo in your
repository really looks like.
Maybe you don't want to or cannot share that information, that's fine.
I think in this case it would be best if you could try to reproduce the
failing merge with a small example script, starting by creating an empty
repository, and running svn commands creating all necessary branches
and doing merges in order to make the problem appear. Then we can reason
about that example and try to find out what is wrong.
You can find an example script you can base your own script on here:
http://subversion.apache.org/docs/community-guide/repro-template.sh
Thanks,
Stefan
Received on 2010-05-10 11:08:03 CEST