merging code in two separate directories

Hi,

I am a complete newbie with subversion.
I have a project with two branches and the
source files lie in two different directories.
I would like to merge the two. My old approach would be
to run diffs by hand and reconcile the differences.
(There will be a lot of them.)

My questions are:

1.) Is there a better way with subversion to do this?

2.) If so a quick sketch of how to go about this would be very useful.

   Thanks,

    Dave

-- 
David A. Fournier
P.O. Box 2040,
Sidney, B.C. V8l 3S3
Canada
Phone/FAX 250-655-3364
http://otter-rsch.com
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2386539
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].