Ogre 2 and Ogre 1 merge strategy

[altren]

I'm doing some fixes that can hit anyone using both ogre 1.x and 2.x and I see that some of them can be applied to the 2.x as well.
Also, I looked through the repository log and it seems that these branches have diverged a long time ago.
So my question is is there any plans to merge 1.x into 2.x? Should I do two pull requests, if they are good for both branches?

[altren]

@dark_sylinc, @paroj Any thoughts on this?

[paroj]

as you have noted the two branches diverged too far by now to be merged - this leaves

Should I do two pull requests, if they are good for both branches?

as the only option.

[Ybalrid]

as you have noted the two branches diverged too far by now to be merged

Ogre 2.x is definitively a hard fork.

IMHO this is something the community should think about: Something should be done to simplify the transition between 1.11 to 2.x, and only have 1.x being there for legacy support. I know 2.x has still some missing features (e.g. Morph animations on v2 Items), that it's basic setup is more complex (has to setup a compositor and rendering node, can't just tell a camera to render to a viewport without it), and that Android support is a problem due to the GLES 2/3 RenderSystems.

As of now, between 1.x and 2.x it's a bit like having 2 separated projects that inherit from the same code-base, not just a new development branch for 2.x... Heck, the main development of each actually happens in separated "upstream" repositories (a git one on github, and an hg one on bitbucket), they just happen to have their respective v1 and v2 branches synced from time to time.

[Zonder]

They have different major versions for a reason.....

Would you expect Microsoft to merge windows 10 and 7 together?