Clone (from SVN) and Merge multiple repositories.

[Pandu Poluan]

Hello List,

I'm going to be the maintainer of several intertwined open source
repositories, originally in SourceForge using SVN.

After checking the code, I decided to merge the repositories (it was
originally a single repository, split to ease tracking using SVN).

Now, the key point is that the current maintainer wants to "finish his
backlog" before handing over, while at the same time I would like to start
new development.

What strategy do you recommend, so that I can still track his 'upstream'?

I had planned on doing it this way:


[proj1 at sf] -- clone -->

   .... o---o---o---o---o    [default]
             \           \      merge for every new change from 'upstream'
              o-----------o  [upstream/proj1]


Do the above for each project, then create a new project:

   .... o--------o       [upstream/proj1] (pull -f from the local clone)
                  \
   .... o--------o \     [upstream/proj2] (pull -f from the local clone)
                  \ \
   .... o--------o \ \   [upstream/proj3] (pull -f from the local clone)
                  \ |/
                    o--- [default]

So, essentially a multiple merge of several branches into the "default"
branch.

(I hope the ASCII art makes it)

Do you think this is a good idea, or is there a better way?


Rgds,
--
FdS Pandu E Poluan
~ IT Optimizer ~

 • LOPSA Member #15248
 • Blog : http://pandu.poluan.info/blog/
 • Linked-In : http://id.linkedin.com/in/pepoluan
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial/attachments/20141202/eb2bd3f4/attachment.html>