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

Re: merging 3rd party projects

From: Manuel Vacelet <manuel.vacelet_at_gmail.com>
Date: 2005-06-30 13:49:51 CEST

2005/6/30, Tim Harvey <tim_harvey@yahoo.com>:
> 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?

I don't know if it's the easiest way to manage "vendor" branches but
I'm using svn_load_dirs script to perform the import action.

You can do that with tarballs but, IMHO, you should import files
regulary to downsize the diff between each versions.

It doesn't replace a _real_ vendor branch (with branches & merge mgt)
but it's convenient.

> 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?

Yes you should.

> 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?

With svn_load_dirs, yes.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jun 30 15:06:00 2005

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