svn diff after svn merge

Hi,

Maybe I'm doing something wrong, but it seems to me that files that were added through svn merge should appear in the diff.

For example, if I do this:
> svn merge -r 1:2 http://url
--- Merging r1 through r2 into '.':
U my_updated_file.c
A my_newly_added_file.c

And then I do svn diff, I do not get a unified diff with the newly added file in it. I found this defect which talks about the same thing in svn 1.5: http://subversion.tigris.org/issues/show_bug.cgi?id=3261. The bug is marked as "works as expected" because the file is a copy.

If it is a copy, then why did the merge command tell me the file was added (A)?

Furthermore, if it is a copy, I should be able to svn add the file:

> svn add my_newly_added_file.c
svn: warning: 'my_newly_added_file.c' is already under version control

So it is added apparently, but svn diff won't display it. If I revert the add and add it again, svn diff magically works and includes it. This behavior seems contradicting.

I'm using svn 1.6.17 to do this. If there is an easier way to get a patch file out of my merge before I commit, that would be great. I also tried this on svn 1.7, and thankfully there is a --show-copies-as-adds which does this for me, but it seems like a hack and 1.7 is not stable yet.

Thanks,
Dimitar

---------------------------------------------------------------------
This transmission (including any attachments) may contain confidential information, privileged material (including material protected by the solicitor-client or other applicable privileges), or constitute non-public information. Any use of this information by anyone other than the intended recipient is prohibited. If you have received this transmission in error, please immediately reply to the sender and delete this information from your system. Use, dissemination, distribution, or reproduction of this transmission by unintended recipients is not authorized and may be unlawful.
Received on 2011-08-06 12:13:36 CEST