[Pulp-dev] PUP-3: Proposal to change our git workflow

[David Davis]

Just wanted to thank everyone that’s voted or replied already. Some great
discussions on this proposal so far.

There are four more calendar days left to vote. So if you haven’t voted
yet, please do so in the couple days.

Thank you.


David

On Tue, May 30, 2017 at 3:07 PM, Eric Helms <ehelms at redhat.com> wrote:

> As an outside contributor, I'd +1 switching to cherry picking to avoid
> having this conversation everytime a contributor wants to clone the repo,
> make a change, push the change [1]. I think you increase the likelihood of
> first time and repeat contributions if users do not have to be aware of the
> release process and can simply clone the repository, get the default branch
> which most developers these days perceive as the head of development and
> where changes should be made.
>
> As someone who has managed project release that heavily use cherry
> picking, I've found this process to be painless especially after a bit of
> tooling that uses Redmine to tell me what set of issues are required, what
> are their changesets and what git hashes are associated with them. Two
> commands and cherry picking done.
>
>
> [1] https://github.com/pulp/pulp/pull/3037
>
> On Tue, May 30, 2017 at 1:30 PM, Bihan Zhang <bizhang at redhat.com> wrote:
>
>> +1 I think it's worth giving this new process a try.
>> An additional benefit that I have not seen listed is that github push
>> protection can be turned on to all the branches. Which would have someone
>> else sanity check changes before merging.
>>
>> It also means each release only generates one additional commit instead
>> of the 6+ commits per release generated now.
>>
>>
>> On Tue, May 30, 2017 at 10:11 AM, Jeff Ortel <jortel at redhat.com> wrote:
>>
>>> +1
>>>
>>> On 05/24/2017 03:00 PM, David Davis wrote:
>>> > I’d like to kick off the voting on PUP-3 which is the proposal to
>>> change our git workflow by using
>>> > cherry-picks instead of merging changes forward. The proposal can be
>>> viewed here:
>>> >
>>> > https://github.com/daviddavis/pups/blob/pup3/pup-0003.md
>>> >
>>> > Feel free to submit any comments/nitpicks/etc on the PR[0].
>>> >
>>> > PUP-1 outlines our voting system:
>>> >
>>> > https://github.com/pulp/pups/blob/master/pup-0001.md
>>> >
>>> > But to sum it up:
>>> >
>>> > +1: "Will benefit the project and should definitely be adopted."
>>> > +0: "Might benefit the project and is acceptable."
>>> > -0: "Might not be the right choice but is acceptable."
>>> > -1: "Not the right choice and should definitely not be adopted."
>>> >
>>> > I’ll set the initial deadline for the voting to be June 5th 9pm UTC.
>>> >
>>> > [0] https://github.com/pulp/pups/pull/3
>>> >
>>> > David
>>> >
>>> >
>>> > _______________________________________________
>>> > Pulp-dev mailing list
>>> > Pulp-dev at redhat.com
>>> > https://www.redhat.com/mailman/listinfo/pulp-dev
>>> >
>>>
>>>
>>> _______________________________________________
>>> Pulp-dev mailing list
>>> Pulp-dev at redhat.com
>>> https://www.redhat.com/mailman/listinfo/pulp-dev
>>>
>>>
>>
>> _______________________________________________
>> Pulp-dev mailing list
>> Pulp-dev at redhat.com
>> https://www.redhat.com/mailman/listinfo/pulp-dev
>>
>>
>
> _______________________________________________
> Pulp-dev mailing list
> Pulp-dev at redhat.com
> https://www.redhat.com/mailman/listinfo/pulp-dev
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/pulp-dev/attachments/20170601/f94a8140/attachment.htm>