phpBB

Development Discussion Board

phpBB's testing ground of bleeding edge code
Advanced search

Submitting patch for 3.0.9

Discuss general development subjects that are not specific to a particular version like the versioning control system we use or other infrastructure.

Submitting patch for 3.0.9

Postby josno » Thu Nov 03, 2011 2:54 pm

I've just created a ticket (10439) for which I have a patch. I noticed that the develop branch has changed the way the ACM is organised and so I altered my patch accordingly. However, I've since noticed the develop-olympus branch. Which should I base my git branch on?
josno
Registered User
 
Posts: 3
Joined: Sun Mar 20, 2005 9:40 pm

Re: Submitting patch for 3.0.9

Postby t_backoff » Thu Nov 03, 2011 3:41 pm

The develop-olympus is the branch for 3.0.x. The develop branch is 3.1.x.
User avatar
t_backoff
Moderator Team
Moderator Team
 
Posts: 114
Joined: Sat Jun 12, 2010 3:25 am

Re: Submitting patch for 3.0.9

Postby Oleg » Fri Nov 04, 2011 1:22 am

Normally in these situations one would create two pull requests, one for develop-olympus and one for develop.

This assumes the changes will in fact be acceptable for 3.0; if they turn out to be too big for 3.0 then you only need to create a pull request against develop.

Right now the ticket does not have a fix version, which is because it does not have the information necessary to determine what version the fix should go in. Thus I would suggest putting all of the changes you have on github for review. If you already made changes against both 3.0 and 3.1 create two branches, one for each set of changes.
Oleg
3.1 Release Manager
3.1 Release Manager
 
Posts: 1150
Joined: Tue Feb 23, 2010 2:38 am

Re: Submitting patch for 3.0.9

Postby josno » Fri Nov 04, 2011 10:20 am

Great, thanks for your replies. I didn't include much in my ticket because I thought my code would be fairly self-explanatory. We'll see!
josno
Registered User
 
Posts: 3
Joined: Sun Mar 20, 2005 9:40 pm

Re: Submitting patch for 3.0.9

Postby Oleg » Fri Nov 04, 2011 12:40 pm

The patch is looking good to me, except the newline at the end must be taken out for develop-olympus.

Do you have the develop version as well? If so please create a separate pull request with it.
Oleg
3.1 Release Manager
3.1 Release Manager
 
Posts: 1150
Joined: Tue Feb 23, 2010 2:38 am

Re: Submitting patch for 3.0.9

Postby naderman » Fri Nov 04, 2011 1:34 pm

Hey, I closed your ticket, because the patch doesn't actual improve performance. But I would like to thank you for working out how to contribute, and hope you'll still contribute something else in the future!
www.naderman.de
Move your forum to Forumatic - we'll take care of maintenance & spam
User avatar
naderman
Development Team Leader
Development Team Leader
 
Posts: 1650
Joined: Sun Jan 11, 2004 2:11 am
Location: Karlsruhe, Germany

Re: Submitting patch for 3.0.9

Postby josno » Fri Nov 04, 2011 4:28 pm

I've commented on the pull request and ticket. Let me know how I can prove to you it's quicker!
josno
Registered User
 
Posts: 3
Joined: Sun Mar 20, 2005 9:40 pm


Return to General Development Discussion

Who is online

Users browsing this forum: No registered users and 6 guests