[Pkg-puppet-devel] developing the 0.25.0 debs...

[Nigel Kersten]

+ pkg-puppet-devel as I forgot the first time.

On Tue, Sep 8, 2009 at 7:52 AM, Nigel Kersten<nigel at explanatorygap.net> wrote:
> On Mon, Sep 7, 2009 at 11:18 PM, Stig Sandbeck Mathisen<ssm at fnord.no> wrote:
>> Nigel Kersten <nigel at explanatorygap.net> writes:
>>
>>> Stig, when you did this though, you've lost all version control
>>> history for the puppet 0.25.0 branch itself haven't you?
>>
>> Yes.
>>
>> When using git-import-orig, the version control history for the upstream
>> branch is simply "add and mangle this tarball", and nothing much is
>> going to happen there until the next tarball is imported with the next
>> puppet release.
>>
>>> If that's what we have to do, then ok, but I was hoping to avoid that.
>>
>> It is far simpler, but certainly less elegant.
>>
>> How would patches from upstream for eventual documentation- and bugfixes
>> be handled?  A separate branch, or the use of patch handling tools like
>> quilt?
>
> 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
>
> We've yet to work out a good patch approval workflow, and it doesn't
> seem like we're the only ones.
>
> 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?
>
> 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.
>
> This is probably a big enough topic to warrant its own thread...
>