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

Re: newbie: confused abt merging checkouts w/ co, up, sw ...

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-01-11 23:25:17 CET

On Sun, 2004-01-11 at 15:53, OpenMacNews wrote:

> svnrepo
> |
> |-----stable
> | |
> | |-- {doc_root_files}
> | |
> | |-- themes/
> | | |
> | | |-- theme_1
> | | | |-- {theme_1_files}
> | | |
> | | |-- theme_2
> | | |-- {theme_2_files}
> | |
> | |-- modules/
> | | |
> | |-- module_1
> | | |-- {module_1_files}
> | |
> | |-- module_2
> | |-- {module_2_files}
> |
> |-----dev_modules
> | |
> | |-- dev_module_1
> | | |-- {dev_module_1_files}
> | |
> | |-- dev_module_2
> | | |-- {dev_module_1_files}
> |
> |-----dev_themes
> |
> |-- dev_themes_1
> | |-- {dev_themes_1_files}
> |
> |-- dev_themes_2
> | |-- {dev_themes_1_files}
>
>

Okay, so my first question: it seems like you've laid out the
repository this way because you imagine three separate "projects": one
project is named 'stable', one is named 'dev_modules', and one is named
'dev_themes'.

But is 'dev_modules' really a project? Or is it just a directory
holding a bunch of separate projects? I mean, might it not be easier to
think of 'dev_module_1' as a project? I'll explain why I'm thinking
this way further down.

> doc_root
> |
> |-- {doc_root_files}
> |
> |-- themes/
> | |
> | |-- theme_1
> | | |-- {theme_1_files}
> | |
> | |-- theme_2
> | | |-- {theme_2_files}
> | |
> | |-- dev_theme_1
> | | |-- {dev_theme_1_files}
> | |
> | |-- dev_theme_2
> | |-- {dev_theme_2_files}
> |
> |-- modules/
> |
> |-- module_1
> | |-- {module_1_files}
> |
> |-- module_2
> | |-- {module_2_files}
> |
> |-- dev_module_1
> | |-- {dev_module_1_files}
> |
> |-- dev_module_2
> |-- {dev_module_2_files}
>

Okay, so you want to run 'svn checkout', and get a working copy
structured like the above.

The good news is, you can certainly do that, using the 'svn:externals'
directory property. It's similar to building a module in CVS. You
would basically set this property on the repository's /stable directory
to something like this:

   themes/dev_theme_1 http://host/repos/dev_themes/dev_theme_1
   themes/dev_theme_2 http://host/repos/dev_themes/dev_theme_2
   modules/dev_module_1 http://host/repos/dev_modules/dev_module_1
   modules/dev_module_2 http://host/repos/dev_modules/dev_module_2

Now, when you run 'svn checkout http://host/repos/stable', you'll first
get a complete copy of the 'stable' directory, and then you'll get 4
"extra" checkouts happening within your working copy's themes/ and
modules/ areas.

The bad news is, if you add a new module or theme to the dev areas,
you'll need to also add it to the svn:externals definition. There's no
automated correpsondence.
   
> (a) automate the 'bk get' of latest Xaraya dev files in the hierarchy they're maintained/presented
> (b) integrate the Xaraya files into a svn-owned vms tree
> (c) pull from svn into the working hierarchy that i need

Replicating from bitkeeper to svn isn't a trivial thing... you might
want to ask Ben Collins about his mirroring system. Hm.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Jan 11 23:26:11 2004

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.