Re: svn:mergeinfo problem

Matjaz wrote:
> Hi,
>
> I'm experiencing a rather strange problem merging the code from trunk
> to a branch. Here's what do:
> - on a branch checkout folder with no local changes I choose Merge,
> Merge a range of revisions
> - I enter the trunk URL
> - select the revision using Show log button - there's one one file
> changed in that revision
> - I perform the merge using the default options
>
> Checking for modifications should show only one changed file, but
> there are several files there:
> - the expected file is there, the 'show diff' gives expected results
> - 'show diff' on any other file that's marked as modified results in
> two TortoiseMerge windows popping up: the first one shows the changes
> in the selected file (of course, there's actually no change), the
> second one is for v, again showing no changes and no content either.
>
> I was investigating a little and found out that the files that appear
> as modified have a 'svn:mergeinfo' property set (on that branch), but
> there's no value. This property was set in a revision way before the
> one being merged. Plus shouldn't there be a value indicating the
> revision that was merged? I must say I update my TortoiseSVN to the
> latest nightly quite often, so this could be the result of an
> unfinished functionality or a bug that was present at some point. Also
> note the Apache based server I'm using still uses the SVN version that
> does not support merge-tracking.

I'm not sure why the svn:mergeinfo property had no value. But you should
try removing all those properties from all your files/folders and then
try again. There were some changes in the svn library for that property
and it's handled now a little differently than before 1.5.x was branched.

> One more thing: TortoiseMerge showing svn:mergeinfo shows no changes
> and no content and crashes when 'next difference' or 'previous
> different' buttons are used.

Fixed the crash in r12805.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net