[Pkg-puppet-devel] Packaging workflow (was: developing the 0.25.0 debs...)

[Nigel Kersten]

On Tue, Sep 8, 2009 at 8:10 AM, Stig Sandbeck Mathisen<ssm at fnord.no> wrote:
> Nigel Kersten <nigel at explanatorygap.net> writes:
>
>> So in 0.24.x we merged the upstream branch in and added the debian/*
>> stuff to it.
>>
>> I'm tempted to say that given the weight of code on the upstream side
>> compared to ours, that we do the same thing, losing history on our
>> debian/* files rather than 0.25.x
>
> You can export the commits to the debian/ directory as a series of
> patches with "git format-patch", and import them with "git am", thereby
> keeping the commit history of this directory.
>
> If the upstream 0.25.x is merged/pulled/whatever as the "upstream"
> branch, tagged as "upstream/0.25.0", and then merged to master, the
> debian/ directory patches can be added to master, keeping both
> histories, and making sure git-buildpackage works without too many magic
> options.

So this is what I tried last time, but the problem was that I had
trouble identifying when 0.25.0 diverged from 0.24.x upstream, and the
merge was not a trivial matter. They diverged an awfully long time
ago.

I hadn't thought of exporting the debian dir as a series of patches.
That's a promising approach.


>
>> We've yet to work out a good patch approval workflow, and it doesn't
>> seem like we're the only ones.
>
> Looks likely, yes.
>
>> I've been thinking that we should start mimicing upstream puppet, and
>> using git format-patch and git send-email and doing approval on the
>> emailed patches maybe?
>
> Looks like it works, yes.

Yeah. I kind of dislike reading patches via email (especially for
projects that aren't insistent upon 80 char line lengths...) but it's
better than we have now, so we should start doing it.

>
>> Otherwise we could have people make branches for specific issues, and
>> have someone else merge them into the main branch as a form of
>> approval.
>
> The format-patch / send-email would be easier, we'll need discussion
> from time to time as well.  If needed, a patchwork webapp could be set
> up somewhere (like on http://patchwork.kernel.org/, it just subscribes
> to a mailing list, and displays received patches)
>
>> This is probably a big enough topic to warrant its own thread...
>
> :)
>
> --
> Stig Sandbeck Mathisen
> Trust the Computer, the Computer is your Friend
>
> _______________________________________________
> Pkg-puppet-devel mailing list
> Pkg-puppet-devel at lists.alioth.debian.org
> http://lists.alioth.debian.org/mailman/listinfo/pkg-puppet-devel
>