> On Sun, 2004-01-11 at 14:30, OpenMacNews wrote:
>
>> fair enuf ... but once i've done the 'svn mv' locally, and make any changes to now-merged file collections in
>> "apples/" and "oranges/" (per my earlier example ...) when I commit, WHAT am I committing back INTO? the SEPARATE
>> dirs (e.g., .../apples/ and .../dev_apples/? or, now, everything back into "just" .../apples/)?
>
> What you're trying to do is pretty awkward, and not possible in
> Subversion. There's no way for a working-copy directory tor eflect the
> "union" of two repository directories.
>
> You can use 'svn switch' to make sub-trees of your working copy map to
> specific sub-trees in the repository, but that's just a simple tree
> rearrangement. The most common case for that is, "please switch this
> subdirectory here to a branch."
>
> But that's as far as the idea goes. You can mix and match repository
> subtrees, but not the *contents* of directories. Moving files doesn't
> work. You don't want to move files; that would imply moving them in
> the repository once you do a commit, and you certainly don't want things
> to move around in the repository.
>
> I think you need to explain your rationale... what problem are you
> trying to solve, and how does laying out your repository in a certain
> way (and wanting the "union" feature) help you solve the problem?
> Chances are, there's probably a much simpler solution.
hi,
<confused> all you unreasonable people expecting me to be able to 'splain myself' ;-)
ok, here's my rationale ... as much as its rational! ... using a specific example.
it all starts around use of the Xaraya cms/portal system .... and three 'factoids':
(1) i've never 'seriously' used a version mgmt sys; only cvs for 'lite' work
(2) xaraya uses bitkeeper, and i don't want to
(3) my intent/goal is to use/manage with subversion
now, to the example ... for my own sanity's sake, i'll describe step-by-step ...
a 'standard' install of a 'release version' installs the following, e.g., in an Apache doc_root:
doc_root
|
|-- {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}
i'm interested in DL'ing the Xaraya project's dev(head) version using THEIR version management system (bitkeeper), and
merging/union-ing selected files/dirs, into my subversion hierarchy, and eventually my working dirs ...
# 'get' the Xaraya dev dirs into a working dir:
mkdir ~/work
bk clone http://www.xaraya.com:15000/stable ~/work/stable
bk clone http://www.xaraya.com:15000/modules ~/work/modules
bk clone http://www.xaraya.com:15000/themes ~/work/themes
# create/initialize a svn repository:
mkdir /usr/local/svnrepo
svnadmin create /usr/local/svnrepo
# create a dummy tree hierarchy:
mkdir -p ~/tempdir/xaraya_dev/stable
mkdir -p ~/tempdir/xaraya_dev/dev_modules
mkdir -p ~/tempdir/xaraya_/dev/dev_themes
# import Xaraya bk clones into svn tree
svn import ~/tempdir/xaraya_dev/stable file:///usr/local/svnrepo/xaraya_dev/stable
svn import ~/tempdir/xaraya_dev/modules file:///usr/local/svnrepo/xaraya_dev/dev_modules
svn import ~/tempdir/xaraya_dev/themes file:///usr/local/svnrepo/xaraya_dev/dev_themes
where the svnrepo listing is, effectively:
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}
now, here's the 'meat' ---- getting the files/dirs into my working 'doc_root'.
my goals are to:
(1) move the CONTENTS of svnrepo/stable to doc_root
(2) add the CONTENTS of svnrepo/dev_modules to doc_root/modules
(3) add the CONTENTS of svnrepo/dev_themes to doc_root/themes
so that i END UP with:
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}
via this process (i think), i can:
(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
i'll shut up now, and listen to those wiser/more experienced than me for education/comments/suggestions!
thanks!
richard
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Jan 11 22:53:57 2004