On 30-Nov-2015, Barry Warsaw wrote: > On Nov 28, 2015, at 05:37 PM, Ben Finney wrote: > > >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.
I have made another attempt, by using the above separation to inspire several parallel branches: * master: An integration-only branch for what the DPMT team requires. * upstream: The upstream source from released tarballs. * pristine-tar: The data from ‘pristine-tar(1)’ for the tarballs. * packaging: The Debian packaging. > >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. I now keep the ‘upstream’ and ‘packaging’ branches representing the parallel work: they never moerge into each other. All the actual development work on the package goes to: * Importing upstream tarballs to ‘upstream’ and ‘pristine-tar’. * Developing the Debian packaging on ‘packaging’. The ‘master’ branch, for those who want it, is the result of only merge commits from ‘upstream’ and ‘packaging’, in order to make finalised Debian releases. > 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. This was somewhat a revelation for me. The full history from the earlier VCS is the most valuable part: it's the packaging work that is the whole point of the repo I'm creating. So I keep the integrity of that by keeping it on ‘packaging’ branch, and only merge it to ‘master’ when ready to release. The repo is now online at <URL:https://anonscm.debian.org/git/collab-maint/pkg-python-lockfile.git/>. Do you think that meets the DPMT policy? -- \ “When [science] permits us to see the far side of some new | `\ horizon, we remember those who prepared the way – seeing for | _o__) them also.” —Carl Sagan, _Cosmos_, 1980 | Ben Finney <b...@benfinney.id.au>
signature.asc
Description: PGP signature
