[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 16:20:37 CEST

2005/6/30, Tim Harvey <tim_harvey@yahoo.com>:
> I wasn't even aware that this script existed or came with subversion (is it
> new?).

Since 1.x line I guess.

> So, using the methodology
> of creating a branch in imports for each release you choose to sync with, this
> tool simply assists you in the creation of that import correct?

No! You create on vendor branch, you import your non versionned stuff.
Now you can load new versions of sources with svn_load_dirs in the same branch.
 

> > It doesn't replace a _real_ vendor branch (with branches & merge mgt)
> > but it's convenient.
> >
>
> You mean that this tool is for first-time imports into your repo only right?

No I just point this tool is not a kind of bridge between different
versionning systems (CVS -> SVN for instance).
Informations about branches dependencies, delta, ... are not imported.
When you load a new version of sources you create a new delta even if
it should be very close of the one you have in the original
versionning system.

> Yes, I see that it doesn't do any merging.

It does merge but do not resolve conflict if any.

> Is there any dissadvantage to doing this? By importing each kernel minor
> release for example, your repository will grow rather quickly. Are there any
> performance issues based on the size of your repository due to this method?

No because you have only one branch, repository just store deltas.

You can find more informations in the Book, Chapter 7 "Vendor branches"

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jun 30 17:59:08 2005

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