Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:44999 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 38534 invoked from network); 16 Jul 2009 22:45:13 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 16 Jul 2009 22:45:13 -0000 Authentication-Results: pb1.pair.com smtp.mail=shire@tekrat.com; spf=permerror; sender-id=unknown Authentication-Results: pb1.pair.com header.from=shire@tekrat.com; sender-id=unknown Received-SPF: error (pb1.pair.com: domain tekrat.com from 208.43.138.18 cause and error) X-PHP-List-Original-Sender: shire@tekrat.com X-Host-Fingerprint: 208.43.138.18 sizzo.org Linux 2.6 Received: from [208.43.138.18] ([208.43.138.18:48545] helo=sizzo.org) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 78/F5-09639-87DAF5A4 for ; Thu, 16 Jul 2009 18:45:12 -0400 Received: from shirebook.local (1601br1-egress-1.corp.tfbnw.net [204.15.20.90]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by sizzo.org (Postfix) with ESMTPSA id 261CDCBE472; Thu, 16 Jul 2009 15:45:09 -0700 (PDT) Message-ID: <4A5FAD73.1060109@tekrat.com> Date: Thu, 16 Jul 2009 15:45:07 -0700 User-Agent: Postbox 1.0b13 (Macintosh/2009062916) MIME-Version: 1.0 To: jani.taskinen@iki.fi CC: Rasmus Lerdorf , PHP Developers Mailing List References: <4A5FA493.9040204@lerdorf.com> <4A5FA8B2.1080102@sci.fi> In-Reply-To: <4A5FA8B2.1080102@sci.fi> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [PHP-DEV] svn checkout suggestion From: shire@tekrat.com (shire) 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