News for hackers. Stuff that matters.
Re:PHP Hacking aka trying to push PHP internals forwards by sc68cal on Friday June 10, 2011 @03:02PM (#2642026)
Why oh why didn't he fork php/php-src, make a branch for his changes, then commit as he went along? This just ends up as a big patchbomb. They're never going to merge his changes, and I don't blame them.

EDIT - Hopefully we can straighten this around: https://github.com/infusion/PHP/commit/790d551ac9ef8e204b44f...

Re:PHP Hacking aka trying to push PHP internals forwards by jrockway on Friday June 10, 2011 @03:26PM (#2642096)
In this case, it would be better to maintain it as several topic branches (so that each logical change can be implemented in as many patches as necessary), and then a good old octopus merge as "master" that you force-update every so often.

(Yes, everyone hates you for modifying published history, it's evil, it will give you bad breath, yeah yeah yeah. But you have to think of this use case as a "code wiki" rather than "list of changes leading to the current state". After the patches are accepted, then don't force update them. When they are still in flux, modify history as often as necessary to make your changes easily comprehensible.)

Re:PHP Hacking aka trying to push PHP internals forwards by sc68cal on Friday June 10, 2011 @03:58PM (#2642187)
His work is based off 5.3.x, there is probably a branch for it in the official SVN repo. As one commenter noted, the github mirror is stale so he'd need to fork it and then update it with the official svn to find the branch.

It may make sense to rebase it off of trunk of svn.

Re:PHP Hacking aka trying to push PHP internals forwards by mattyb on Friday June 10, 2011 @03:37PM (#2642125)
What do you mean by force update?
Re:PHP Hacking aka trying to push PHP internals forwards by josegonzalez on Friday June 10, 2011 @04:10PM (#2642233)
master would always contain the php-base+the octopus merge. So if the php-base was 5.3.6, it would be 5.3.6+patches. Tomorrow PHP 5.3.7 comes out, and then master would be 5.3.7+patches.