On Nov 28, 2015, at 05:37 PM, Ben Finney wrote: >Okay, I've been struggling mightily with Git. Both in the “working >together” sense, and in the “fighting against” sense. Can you help?
I'm certainly willing to try! >I'm quite loath to lose the simplicity of a Debian packaging >repository. There is a deliberate layer of separation that has served >very well in the VCS to date for this package: the separation of VCS >repos matches the separation of concerns. Debian's packaging is of >necessity applied on top of whatever upstream does with their source. > >In order to have the history of packaging work retroactively include >upstream's sources – in order for every past revision in the VCS be >accompanied in the VCS by whatever upstream source is referenced by >that packaging work – I assume we need to import and merge the >upstream sources at each of those states, from the upstream tarballs. This is essentially what Stephano's scripts do for the DPMT conversion from svn to git. They are smart about interweaving the svn, upload, and upstream history into a coherent git DAG. It even worked most of the time. :) Unfortunately, I don't know if it's even feasible to port to bzr, but that would be one place to start if you want to preserve full history. git://git.debian.org/users/stefanor/dpmt-migration.git An alternative is to preserve only upload history, and this is the path I originally went down before switching to Stephano's scripts. It uses debsnap to grab the upload history and attempts to weave that into a coherent DAG. It throws away the original vcs history, which I was okay with because the old vcs history wasn't going away. I've used this to convert a few packages I cared about, but I haven't tried it in a while, so YMMV. git://git.debian.org/users/barry/import-dscs.git >I've attached a document that shows the sequence of commands I >recorded as a recipe for what I've achieved so far. Yep, sorry, my git-fu isn't adept enough to be able to solve the problem at the bottom of the doc. Maybe studying Stephano's scripts will provide some insight. If not, then the git and/or debian-devel mailing lists would be the place to go. TBH, if it were me, I'd probably take one of the simpler approaches and not worry about preserving all the vcs history from Bazaar.
pgpZSB5QfVn28.pgp
Description: OpenPGP digital signature
