[Tutorial] How to create pull requests for core events

Discussion forum for Extension Writers regarding Extension Development.
nicofuma
3.2 Release Manager
3.2 Release Manager
Posts: 527
Joined: Sun Apr 13, 2014 1:47 am
Location: Grenoble - France

Re: [Tutorial] How to create pull requests for core events

Post by nicofuma » Wed Jun 03, 2015 12:41 pm

javiexin wrote:What is the base branch to use for the pull requests for 3.1 as of today?

The tutorial states it is develop-ascareus, however, it is way behind 3.1.x, that seems to be more up to date.

I have tried to use develop-ascareus always, but I did some into 3.1.x, and there seems to be almost no difference...

What is the correct way to do it? Thanks,
-javiexin
3.1.x always

the develop branches have been deprecated in favour of 3.0.x 3.1.x and master branches

EDIT: I have edited the text in the first post. But for the screenshots...
Member of phpBB Development-Team
No Support via PM

User avatar
javiexin
Code Contributor
Posts: 1157
Joined: Wed Oct 12, 2011 11:46 pm
Location: Madrid, Spain
Name: Javier
Contact:

Re: [Tutorial] How to create pull requests for core events

Post by javiexin » Wed Jun 03, 2015 6:55 pm

Thanks.

Now, I have several PRs that I made against develop-ascareus (as per this tutorial). What should I do to them?
Submit new ones against 3.1.x? Or ask someone to change them? I just do not want to have them delayed more due to this stupid mistake on my part...

My fault :(
-javiexin

User avatar
3Di
Registered User
Posts: 11703
Joined: Mon Apr 04, 2005 11:09 pm
Location: Milano - Frankfurt
Name: Marco
Contact:

Re: [Tutorial] How to create pull requests for core events

Post by 3Di » Wed Mar 30, 2016 1:51 pm

Let's try to make this long story short (steps and effort)
  • Fork the phpBB repository on github
  • Go to the phpBB repository, not your fork
  • Chose the branch/file to edit
  • Click on Edit (top-left)
  • Edit the file and while saving it github automatically creates a branch on you fork
  • Create a PR
  • Get back into the tracker and link the new PR into the ticket
Am I missing something?
Want to compensate me for my interest? Donate
Please PM me only to request paid works. Thx.
Extensions, Scripts, MOD porting, Update/Upgrades

Senky
Extension Customisations
Extension Customisations
Posts: 1330
Joined: Thu Apr 30, 2009 8:49 pm
Location: Slovakia
Name: Jakub

Re: [Tutorial] How to create pull requests for core events

Post by Senky » Wed Mar 30, 2016 4:13 pm

3Di wrote:Am I missing something?
Quite yes. The most important part is to properly fill commit message. It must start with the [ticket/<ticket_id>] and short description and end with a new line and PHPBB3-<ticket_id>. This is a requirement which will also automatically bind your PR to issue in the tracker, so you do not need to link it manually.

User avatar
3Di
Registered User
Posts: 11703
Joined: Mon Apr 04, 2005 11:09 pm
Location: Milano - Frankfurt
Name: Marco
Contact:

Re: [Tutorial] How to create pull requests for core events

Post by 3Di » Wed Mar 30, 2016 4:18 pm

Thx. A clear example?
Want to compensate me for my interest? Donate
Please PM me only to request paid works. Thx.
Extensions, Scripts, MOD porting, Update/Upgrades

User avatar
RMcGirr83
Recognised Extension Developer
Posts: 20263
Joined: Wed Jun 22, 2005 4:33 pm
Location: Your display
Name: Rich McGirr
Contact:

Re: [Tutorial] How to create pull requests for core events

Post by RMcGirr83 » Wed Mar 30, 2016 5:20 pm

Just look at any of the PR's that have been merged...like this one for example
In times of change, learners inherit the earth, while the learned find themselves beautifully equipped to deal with a world that no longer exists - Eric Hoffer
Former Modifications/Extensions Team Member | My extensions
Appreciate the extensions/mods/support then buy me a beer
All requests for support via PM will be ignored

User avatar
bonelifer
Community Team Member
Community Team Member
Posts: 3237
Joined: Wed Oct 27, 2004 11:35 pm
Name: William
Contact:

Re: [Tutorial] How to create pull requests for core events

Post by bonelifer » Wed Mar 30, 2016 5:46 pm

3Di wrote:Thx. A clear example?
So using Rich's example:
Here's the tracker ticket url: https://tracker.phpbb.com/browse/PHPBB3-14329

So the commit title should should start with:
[ticket/14329]

Then in the body after your commit message leave a blank line and put:
PHPBB3-14329

Code: Select all

[ticket/14329] Here's my commit message

More detailed message if necessary

PHPBB3-14329
Knowledge Base | phpBB Board Rules | Search Customisation Database
Image
Please don't contact me via PM or email for phpBB support .

User avatar
3Di
Registered User
Posts: 11703
Joined: Mon Apr 04, 2005 11:09 pm
Location: Milano - Frankfurt
Name: Marco
Contact:

Re: [Tutorial] How to create pull requests for core events

Post by 3Di » Wed Mar 30, 2016 6:14 pm

Very clear. Thank you all guys. :)
Want to compensate me for my interest? Donate
Please PM me only to request paid works. Thx.
Extensions, Scripts, MOD porting, Update/Upgrades

Post Reply

Return to “Extension Writers Discussion”

Who is online

Users browsing this forum: jurgis, oBot and 7 guests

cron