[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

merging code in two separate directories

From: dave fournier <otter_at_otter-rsch.com>
Date: Sun, 23 Aug 2009 11:12:05 -0700


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.



David A. Fournier
P.O. Box 2040,
Sidney, B.C. V8l 3S3
Phone/FAX 250-655-3364
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-08-23 21:39:44 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.