On Oct 11, 2007, at 14:20, Randall Meadows wrote:
> I looked around a bit, but couldn't find anything that definitively
> answered my question.
>
> I have a repo that I've been using while working for a client; the
> client now wants to host a repo on their servers, and merge my work
> with that of another programmer they have. None of my actual work
> overlaps with the other programmer, but the structure of our repos
> do. That is, both repos have, at their root:
>
> /trunk/
> /branches/
> /tags/
>
> All the stuff in my "trunk" is different than what's in the other
> "trunk". When I dump my repo and then load it into their repo,
> will it merge correctly (that is, my "trunk" will NOT overwrite
> their existing "trunk")?
>
> Or do I need to dump the *contents* of my "trunk", and then load
> that into their "trunk"?
You will need to think about what structure you would like for the
new combined repo. Would you like:
/theirs/
trunk/
branches/
tags/
/mine/
trunk/
branches/
tags/
If so, then you would
svn mkdir $REPO/theirs
svn mv $REPO/trunk $REPO/theirs
svn mv $REPO/branches $REPO/theirs
svn mv $REPO/tags $REPO/theirs
svn mkdir $REPO/mine
Then you can dump your repo and load it into $REPO/mine using the --
parent-dir argument to svnadmin load.
If you have another ultimate structure in mind, you may still want to
"svn mkdir" a new directory in their repository, "svnadmin load --
parent-dir" your dump into that new directory. Then you can "svn mv"
everything around until it suits you.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Oct 12 01:08:07 2007