Re: Merge showing many "modified" files with no differences

Jim Garrison wrote:
> It gets worse... The behavior I described occurs when I click the "Diff"
> button on the merge dialog. When I do a "Dry Run", a completely
> different (and incorrect) set of files is listed.
>
> Here's the procedure I followed:
>
> 1) Created the branch, did some work and checked it in on the branch.
> 2) About a week later, merged differences from trunk into the branch and
> committed on the branch
> 3) SVN switched my local workarea back to the trunk
> 4) Attempted a merge from the branch back to the trunk revision. In the
> merge dialog, the "from" revision was the branch HEAD, and the "to"
> revision was the trunk HEAD.
>
> It is at this point that I get the weird results. To summarize:
>
> A Diff lists all the files that are different on the branch plus
> hundreds of unmodified files. I understand this is probably related to
> http://subversion.tigris.org/issues/show_bug.cgi?id=2910.

Not really. It depends on how and where (which dialog) you did the diff
with. The merge dialog does not provide a 'diff' function anymore in the
nightly builds.

> The big problem is that a "Dry Run" (which I assume shows what will
> actually happen) DOES NOT include the modified files. Am I correct in
> expecting that if I do the real merge I'll get exactly what "Dry Run"
> shows? If that's the case I don't seem to have a way to get my changes
> merged correctly.

Even 'dry run' (or 'test merge' as it is called in the nightly build)
doesn't provide the absolutely correct output, because the merge is not
actually executed.

> Luckily it's only a dozen or so files. Should I merge the changes in by
> hand and abandon the branch?

Just do the merge.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org