On Fri, Jul 17, 2009 at 12:45 AM, shire<sh...@tekrat.com> wrote: > Jani Taskinen wrote: >> >> Rasmus Lerdorf wrote: >>> >>> One of the benefits of svn is that we can do cross-branch commit pretty >>> easily now and thus avoid multiple similar commits with annoying MFH/MFB >>> commit log messages that are hard to track. >> >> I did a commit today on all 3 branches and it worked fine except for the >> fact that no commit email was sent anywhere. I sent Gwynne a note about >> it, but so that everyone knows too, don't commit anything like that >> until this is fixed.. >> > > Do we have a long-term plan of using actual merge commands/tools to merge > our branches rather than duplicating commits or manually merging? I think > this could speed up development and allow us to have more control over > releases, versions, etc. I've seen cases in the past where changes fall > through the cracks because they didn't get manually merged up/down. The > ability to merge complete branches as a branch rather than many different > commits could save some hastle assuming everyone follows the same > commit/merge patterns.
I doubt any tools can really help to automatically help to merge changes from one branch to another (in php). However there are many very good merging tools (with UI) out there to ease this process (meld, winmerge, etc.). Cheers, -- Pierre http://blog.thepimp.net | http://www.libgd.org -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
