Re: svn checkout suggestion

From: Date: Thu, 16 Jul 2009 22:45:07 +0000
Subject: Re: svn checkout suggestion
References: 1 2  Groups: php.internals 
Request: Send a blank email to internals+get-44999@lists.php.net to get a copy of this message
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. -shire

« previous php.internals (#44999) next »