Max Bowsher wrote:
> Robin Becker wrote:
>
>>We have been using subversion full time for a couple of weeks with a
>>pair of repositories public & private. Basically the world has read
>>access to public with specified write access whilst private is kept
>>totally password protected.
>>
>>The pair of repositories works OK except for the annoyance of having two
>>branch names etc etc and different revision numbers etc etc.
>>
>>I was wondering if anyone hsa managed to merge two repositories with
>>time interleaving (I guess via svnadmin dump/load with a time merge on
>>the two dump files). I know you can merge from dumps, but the revisions
>>end up sequential with one repo completely before the other in revisions.
>
>
> I don't believe anyone has actually implemented a merge program of this sort, yet.
>
> Could you describe exactly how the paths in your 2 respositories should be merged?
> That will allow me to estimate the complexity of the problem.
.....
The repositories look like
/public/ZZZZ/trunk/AAAA
/public/ZZZZ/branches/bbbb
/public/ZZZZ/tags/tttt
/private/trunk/BBBB
/private/branches/bbbb
/private/tags/tttt
AAAA does not intersect BBBB in trun so my rename plan is approximately
Remove the leading ZZZZ from public paths (so I'll need to eliminate the
initial add of ZZZZ and one of the trunk creates.
To avoid clashes in the branches & tags I plan to rename those as
branches/public_old
tags/public_old
branches/private_old
tags/private_old
Luckily we've only created a couple of revisions in SVN ie most
revisions correspond to our old CVS repositories and probably won't ever
be needed. The small number that we do need can be handomatically moved
or renamed.
Is this sort of thing feasible? I was planning to do this with a python
script & regexes, but see that there is a python binding to the libs.
Unfortunately I don't seem to find a good description of the library
api. (I'm probably looking in the wrong place).
>>Also if such were possible and I ended up with a single repository is
>>there a way to publish part of the repository.
>
>
> http://svnbook.red-bean.com/svnbook/ch06s04.html#svn-ch-6-sect-4.4.2
>
>
>>That way I could create a new world readable public repository
>>incrementally updated from the private one.
--
Robin Becker
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Jul 3 12:22:44 2004