Fixed a bug in D9 RenderSystem. Need help to submit a patch.

Discussion area about developing or extending OGRE, adding plugins for it or building applications on it. No newbie questions please, use the Help forum for that.
Post Reply
MattStevens
Goblin
Posts: 239
Joined: Mon Apr 07, 2008 10:27 pm
x 4

Fixed a bug in D9 RenderSystem. Need help to submit a patch.

Post by MattStevens »

It is the first time I want to submit a patch and I have troubles with the procedure.

I followed the instruction on this page: http://www.ogre3d.org/developers/submit-patch. The problem is I can't find which branch I should choose to fork. I'm working on the official release of 1.9 yet it doesn't not seem to be in the branch list.

A second problem is that the link "creating a pull request" sends to a page not found. Not that I can't find the info once I get to that point but it would be nice if it could be fixed.

User avatar
spacegaier
OGRE Team Member
OGRE Team Member
Posts: 4293
Joined: Mon Feb 04, 2008 2:02 pm
Location: Germany
x 127
Contact:

Re: Fixed a bug in D9 RenderSystem. Need help to submit a pa

Post by spacegaier »

The branch for Ogre 1.9 is this one: https://bitbucket.org/sinbad/ogre/branch/v1-9

Regarding the link: It is only a half-error: The page was not found because Atlassian had renamed it but displayed only the new link to the user without an automatic redirect. Just follow the renamed guide here: https://confluence.atlassian.com/displa ... l+requests . I updated the link on our ogre3d.org website. Thanks for pointing that out!
Ogre Admin [Admin, Dev, PR, Finance, Wiki, etc.] | BasicOgreFramework | AdvancedOgreFramework
Don't know what to do in your spare time? Help the Ogre wiki grow! Or squash a bug...

MattStevens
Goblin
Posts: 239
Joined: Mon Apr 07, 2008 10:27 pm
x 4

Re: Fixed a bug in D9 RenderSystem. Need help to submit a pa

Post by MattStevens »

Thanks for the info, it's done.

User avatar
spacegaier
OGRE Team Member
OGRE Team Member
Posts: 4293
Joined: Mon Feb 04, 2008 2:02 pm
Location: Germany
x 127
Contact:

Re: Fixed a bug in D9 RenderSystem. Need help to submit a pa

Post by spacegaier »

Your pull requests has conflicts with existing changes. Can you please update accordingly and also make sure that you use 4 spaces/blanks instead of tabs on your commit. Thanks.
Ogre Admin [Admin, Dev, PR, Finance, Wiki, etc.] | BasicOgreFramework | AdvancedOgreFramework
Don't know what to do in your spare time? Help the Ogre wiki grow! Or squash a bug...

MattStevens
Goblin
Posts: 239
Joined: Mon Apr 07, 2008 10:27 pm
x 4

Re: Fixed a bug in D9 RenderSystem. Need help to submit a pa

Post by MattStevens »

I'm a little lost because I never used bitbucket before.

The conflicts are with what exactly ? I forked the 1.9 branch since it is the one I am working with and I only have 3 lines of code changed. Do I need to pull all changes made by others on the 1.9 branch before doing my own, or do I need to do the changes on the trunk ?

About the spaces, I have no idea where the option would be. The files downloaded by SourceTree have all hard tabs in them so I didn't change anything. There does not seem to have an option to have spaces instead of tabs.

User avatar
spacegaier
OGRE Team Member
OGRE Team Member
Posts: 4293
Joined: Mon Feb 04, 2008 2:02 pm
Location: Germany
x 127
Contact:

Re: Fixed a bug in D9 RenderSystem. Need help to submit a pa

Post by spacegaier »

For the pull-request to work your fork should be as update to date (compared to the official Ogre repository) as possible, ideally on the same revision. That will often resolve those conflicts then.

Regarding tabs vs. spaces: I forgot you were on the v1-9 branch. Most of coding still has actual tabs there which was changed in v1-10 and newer. Given that your change for v1-9 will end up in default/v1-10 as well (via a merge that we will make from time to time) it would be great to have the changes use spaces instead of tabs. That is nothing that concerns Hg/Mercurial, but is something you need to take care in your editor/IDE. The common ones let you customize that in the settings somewhere.
Ogre Admin [Admin, Dev, PR, Finance, Wiki, etc.] | BasicOgreFramework | AdvancedOgreFramework
Don't know what to do in your spare time? Help the Ogre wiki grow! Or squash a bug...

Post Reply