svn merge directory changes and file changes

I reckon from subversion docs that svn merge have 2
options, depending on whether it is supplied with a
target or not.

But if I want to merge changes to a few files, do I
have to specify them one by one? I tried to use

"svn merge -r 1:4 ../branches ./"

but it does a directory merging, and so any changed
files have to be manually resolved. If I do a

"svn merge -r 1:4 ../branches/index.php ./index.php",
the file conflict is automatically resolved (which is
what I want, but I have to specifically tell svn what
is the file name).

Can this be done?

        
                
__________________________________
Do you Yahoo!?
Friends. Fun. Try the all-new Yahoo! Messenger.
http://messenger.yahoo.com/

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jun 14 10:52:38 2004