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

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.

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.

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

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-01-28 18:22:45 CET