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

Bug#536182: nudge



On Sun, Dec 13, 2009 at 12:19:37PM -0500, micah anderson wrote:
> Excerpts from Andre Tomt's message of Fri Dec 11 19:01:49 -0500 2009:
> > Is 5.2 still in the pipeline for squeeze? I'd really love to get #552047 
> > squashed on Debian proper, either by moving to 5.2+ or adding the 
> > provided patch.
> 
> It looks like in July, Colin said:
> 
> > The delay's mostly been revision control pain at my end (the package
> > is still in CVS and I haven't quite finished migrating it to bzr,
> > which migration would make things a lot easier for me). I'll look into
> > doing it before Debconf.
> 
> Colin, have you managed to get this migration finished? It does sound
> like this would be a painful blocker, and getting this into a more
> reasonable VCS would help in many ways.

I'm sorry for the delay here. It seems that I got stuck somewhere in the
migration, and then put the project on a back burner and forgot to take
it off again when I found some time.

I've restarted the migration work now. Any project like this obviously
involves much voluble cursing of CVS, but I'm making good progress. My
process is:

  * Start with Launchpad's existing automatic import of portable OpenSSH
    trunk.

  * Run cscvs (since that's what Launchpad uses for CVS repositories and
    it's easier to stick to a single tool for parsing any given
    repository) to get imports of all the upstream branches based on
    which I've ever made Debian releases.

    * During this process, it's important to make sure that the file-ids
      of any files added on the branch match those for the same files on
      the trunk so that I don't break merging. (I'm currently working on
      this for the V_3_7 and V_4_1 branches; I should shortly have the
      process down to the point where further branches are more or less
      trivial to handle.)

  * Make notes of all the revision-ids where releases I care about were
    tagged.

  * Use cvs2svn's git mode to produce a dump of my CVS repository, and
    run it through bzr fast-import (since the formats are compatible) to
    add the Debian history to the revision graph at the points noted
    above.

  * Profit!

This is obviously more work than just importing the Debian history, but
I expect it to pay off as the process of merging a new upstream will
become a proper VCS merge and I'll still have all my history for later
archaeology. I've done all the individual steps before so to some extent
the process is mechanical, but because it's CVS I have to stop to fix
minor glitches quite a lot. 

I'll update this bug as I go.

-- 
Colin Watson                                       [cjwatson@debian.org]



Reply to: