[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: Ian Brockbank <ian_at_scottishdance.net>
Date: 2005-06-30 17:59:22 CEST

Hi Tim,

> I wasn't even aware that this script existed or came with
> subversion (is it
> new?). I read over the README and from what I gather its a
> convenience tool
> for putting tarballs, which have no source control info in
> them (ie, no .svn or
> .CVS files) into source control for the first time. 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? It just saves
> you the time of untaring it and importing it? Seeing as
> untaring and importing
> isn't that big of a step, it seems like its most useful if
> you were to take
> advantage of its feature if using a file to specify specific
> options for files
> (the -p cmdline option).

svn_load_dirs is more intelligent than that. It effectively compares the
contents of your on-disk tree with a specified tree in the repository and
will do adds, updates, moves and deletes as appropriate. If requested it
will also then do a copy to a tag.

It shows all adds and deletes before taking any action, so you can approve
or reject each one, and it allows you to point out renames at the same time.
Once you are happy with the list of actions, it goes ahead and updates the
repository. In other words, it tries to work out what subversion actions
would have been required if you checked out the original tree and then
altered it to match the on-disk tree, and then it commits that.

It's a really neat tool which has been around since pre-1.0. It lives
in http://svn.collab.net/repos/svn/trunk/contrib/client-side

Cheers,

Ian Brockbank
Edinburgh, Scotland
ian@scottishdance.net
http://www.scottishdance.net/

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jun 30 21:01:27 2005

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