Effects of merge on added files

All:

I'm a bit of subversion noob (but a cvs veteran) so I apologize in
advance. I am used to creating a trunk with tags for stable releases and
having a branch off of the trunk for each development version, merging
into trunk along the way (i.e. "average" development ala K. Fogel's CVS
black book).

I have a working directory like:

ProjectName/
   trunk/
     Directory_A
   dev_0_01/
     Directory_A
     A_file_added_in_branch.c

If I try the following to merge the branch back into trunk:

cd ProjectName/trunk
svn merge ../dev_0_01@HEAD ./@HEAD

I get errors such as:

Skipped missing target: A_file_added_in_branch.c

I understand that this file doesn't exist in trunk yet and is therefore
not under revision control, but the docs imply that merge works like
diff. I assumed that, like CVS or diff/patch, missing files would be
added. Is this assumption incorrect? I can't find any additional info
that directly describes merging a NEW file. If I do the following:

esammer@ripley trunk $ cd ProjectName/trunk
esammer@ripley trunk $ svn diff --old ../dev_0_01@HEAD --new ./@HEAD

I get the unified diff output that I would expect.

I'm quite sure I've missed something because even in alpha stage,
subversion surely must be able to merge new files as well as changes in
existing files, correct?

I've read the svn book (especially chap. 4) through as well as the guide
for cvs users and found nothing that hits this dead on.

To clarify, in cvs, I would do:

(In working directory root ProjectName)

cvs tag -b DEV_0_01
cvs update -r DEV_0_01
touch A_new_file.c
cvs add A_new_file.c
cvs commit -m 'added new file'
cvs update -j DEV_0_01
cvs commit -m 'merged DEV_0_01 into trunk'

Thanks in advance, and apologies all around for the noob question.

-- 
Eric Sammer
eric@ineoconcepts.com
http://www.ineoconcepts.com
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org