[sabayon] Moving Pessulus into Sabayon: the plan



Hi,

As you know, we need to move the Pessulus sources into Sabayon's
source tree.  This is http://bugzilla.gnome.org/show_bug.cgi?id=346890.  
Right now Sabayon has an outdated copy of the Pessulus sources inside
it.  The idea was that one would run "make update" every one and then,
but that, like all manual processes, just doesn't get around to
happening :)

First of all, I'd like to thank Sayamindu for investigating how to
move the SVN history from place to another.  I'm afraid that using
svn2svn is not the complete solution, so I want to do this in stages.

Svn2svn works by checking out each separate revision of the source SVN
repository, and the re-committing each one to the destination
repository.  Since I already have git-svn on my box, and since it also
does the "checkout every separate revision" thing, I'll be using it to
do the migration.

Issues to note:

* sabayon/admin-tool/lockdown does not contain any significant
  history, since it was always the result of "make upload".  So, we
  can move that data away, import all the Pessulus revisions, and
  re-commit.

* sabayon/admin-tool/lockdown has diverged a bit from the original
  pessulus/Pessulus (this is my fault; I put in the debuglog code
  directly in the Sabayon tree, as well as the changes for
  OpenOffice.org).


My plan is this:

1. Tag the Sabayon and Pessulus repositories.

2. Move sabayon/admin-tool/lockdown to a temporary location.  Call
   this location "divergent".

2. git-svn clone the Pessulus history to my machine.

3. git-commit each revision back to sabayon/admin-tool/lockdown.

4. See what changes are in the "divergent" sources that are not in the
   "official" Pessulus sources.  Merge those in.

5. Export all those revisions back to svn.

6. Ask translators to help us merge the translations (now in
   sabayon/admin-tool/lockdown/po) into the base sabayon/po.

7. Move the Pessulus ChangeLog into sabayon/ChangeLog.pessulus-old

8. Merge HACKING, README, AUTHORS, MAINTAINERS, etc.

10. ???

11. Profit!!!


Additions?  Objections?

  Federico




[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]