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

RE: Advice sought on how to diff and commit multiple files

From: David Aldrich <David.Aldrich_at_EU.NEC.COM>
Date: Thu, 31 Jul 2008 10:51:04 +0100

Hi Ryan

> You will want to use svn_load_dirs.pl to load their code into
> a folder in the /vendor directory in your repository. You
> will then want to make a copy of their code to another
> location in your repository, which is where you will modify
> their code as needed. When you load new versions of their
> code into /vendor, you can then merge their changes into your
> version using svn merge. See the Book:

Thanks very much for pointing me towards vendor branches. I have now carefully read that section and would be happy to work that way.

Somebody else suggested I simply explode the vendor's zip in a branch of my project, resolve any conflicts there and then merge into my trunk. This misses out the vendor branch stage - all storage is in the application directory. What is the advantage of using the more general solution of the vendor branch?


To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-07-31 11:52:38 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.