migrating/merging repositories

hi...

if i do a
svnadmin load oldrepos < newdumpfile

such that the newdumpfile contains a 'foo.txt' in the exact same dir
location as the oldrepos, i get the following error...

[root@lserver2 atest]# svnadmin load /svnroot/svn < newdumpfile
<<< Started new transaction, based on original revision 1

------- Committed new rev 9 (loaded from original rev 1) >>>

<<< Started new transaction, based on original revision 2

------- Committed new rev 10 (loaded from original rev 2) >>>

<<< Started new transaction, based on original revision 3

------- Committed new rev 11 (loaded from original rev 3) >>>

<<< Started new transaction, based on original revision 4
     * adding path : u1 ...svn: File already exists: filesystem
'/svnroot/svn/db', transaction 'o', path 'u1'

i've performed a 'cat' on the two separate repositories, and the files,
while in the same location , are different.

i created the newdumpfile, by extracting a dir from the original repository,
creating a repository, and then modifying the resulting test file.

i'm basically trying to figure out how to extract a dir from a parent
repository, modify the file under it's on child repository, and then
replace/reinsert/update the dir/dump back in the original repository...

given that this should be doable, what am i missing...

the docs/google don't shed any light as to what might be the problem... (and
how to solve it)

thanks

-bruce

-----Original Message-----
From: bruce [mailto:bedouglas@earthlink.net]
Sent: Thursday, August 26, 2004 11:12 AM
To: users@subversion.tigris.org
Subject: copying/merging a repository into a directory...

hi...

in reviewing the docs/google... i can see how to take a dir from a
repository, and add it to it's own repository...

i need to know how to reverse the process. ie, if i have a repository that
consists of files, how would i go about adding it to an existing repository,
such that the files are under the correct dir within the existing
repository..

here's what i'm envisioning:

repo_parent (contains the masterlist/repository)
 /tags
 /branches
 /trunk
   /foo1
     -cat.txt
     -dog.txt
   /foo2

repo_child (the child repository)
 (copied from the parent repository)
   -cat.txt
   -dog.txt

i'd like to be able to copy the '/foo1' from the parent repository
'repo_parent' to the child repository (in this case 'repo_child'), allow the
appropriate users to make the changes to the files within the child
repository, and then copy/move the files from the child repository back to
the '/foo' location within the parent repository...

if i can effectively copy/move the files from the child repository back to
the correct dir within the parent while maintaining the
history/comments/etc.. then this will allow me to essentially restrict user
access to the files within the parent repository...

this approach simply requires that i maintain/update the user access within
each repository's 'svnserve.conf' file.

thanks for any thoughts/assistance/pointers/etc...

-bruce

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Aug 27 00:30:32 2004