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

merging 3rd party projects

From: Tim Harvey <tim_harvey_at_yahoo.com>
Date: 2005-06-30 06:56:59 CEST

I've been using subversion for a while now, but only on simple projects where
i'm the only one making edits.

I'm now investigating using Subversion in the workplace and have a few
questions. I've seen this specific question asked on the maillist archives but
I did not see an answer. This specific pattern is not in the subversion book
either unless I'm simply failing to see it in one of the examples presented
there:

Our project includes the linux kernel source tree. Occasionally we make small
changes to it, and we occasionally want to sync in new kernel versions. What
is the easiest way to accomplish this? For example, should we pull in each
kernel version in an 'import' branch, then merge it into trunk which has the
previous kernel plus our changes? When we perform this merge between the
previous kernel version, the newly imported kernel version, and our working
directory, will files that have been removed in the new kernel version be
removed from the working directory? If conflicts arrise in a given file, is
there a 3-way diff program of choice that is typically used?

Thanks for any information.

Tim

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jun 30 07:09:31 2005

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