[QGIS-Developer] changes in QGIS development with git
William Kyngesburye
woklist at kyngchaos.com
Tue Mar 3 06:10:00 PST 2020
OK, now a backporting problem. The backport run appears to be failing because it can't find my repository. But the merge had no problem finding my repository. huh?
For 2 PRs now.
-----
William Kyngesburye
<kyngchaos at kyngchaos.com>
<http://www.kyngchaos.com>
Don't Panic
>> On Mar 2, 2020, at 11:37 AM, William Kyngesburye <woklist at kyngchaos.com> wrote:
> Thanks. I can add labels.
>
> First one failed travis-ci. Which is odd... failed a test completely unrelated to this change.
>
> -----
> William Kyngesburye
> <kyngchaos at kyngchaos.com>
> <http://www.kyngchaos.com>
>
> Don't Panic
>
>>> On Mar 2, 2020, at 3:10 AM, Denis Rouzaud <denis.rouzaud at gmail.com> wrote:
>>
>>
>>
>>>> Le dim. 1 mars 2020 à 20:04, William Kyngesburye <woklist at kyngchaos.com> a écrit :
>>> It's been a couple years since I made a commit with git, and I find that I can't do that any more. It appears master (and branches?) are locked so that only travis-ci-validated commits can be pushed. That means I have to use a github fork and make pull requests, yay. I just want to make sure I have this correct now.
>>>
>>> I figured out how to reset my 8 year old fork to current master.
>>>
>>> The PR process from my years-old notes:
>>>
>>> 1. merge upstream changes to my fork
>>>
>>> 2. make my changes
>>>
>>> 3. push my changes to my fork
>>>
>>> 4. make PR to qgis upstream
>>>
>>> 5. (new) wait for travis-ci to succeed
>>
>> an added step is to wait for a positive review now
>>>
>>> 6. merge PR
>>>
>>> One thing I'm not sure about is backporting. I've seen [Backport] tagged messages from Github. And I recall talk about problems with the automated backporting bot/app (fixed?).
>> yes it should be working
>>>
>>> How do I handle backporting? Most of the changes I need to make need to be backported.
>> the PR must be labeled with "backport _branchname_". If you cannot define the label (rights) just ask for it to be labeled.
>>
>>
>> _______________________________________________
>> QGIS-Developer mailing list
>> QGIS-Developer at lists.osgeo.org
>> List info: https://lists.osgeo.org/mailman/listinfo/qgis-developer
>> Unsubscribe: https://lists.osgeo.org/mailman/listinfo/qgis-developer
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osgeo.org/pipermail/qgis-developer/attachments/20200303/2e8267c0/attachment.html>
More information about the QGIS-Developer
mailing list