Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:45004 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 50428 invoked from network); 16 Jul 2009 23:17:31 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 16 Jul 2009 23:17:31 -0000 Authentication-Results: pb1.pair.com smtp.mail=pierre.php@gmail.com; spf=pass; sender-id=pass Authentication-Results: pb1.pair.com header.from=pierre.php@gmail.com; sender-id=pass; domainkeys=bad Received-SPF: pass (pb1.pair.com: domain gmail.com designates 72.14.220.156 as permitted sender) DomainKey-Status: bad X-DomainKeys: Ecelerity dk_validate implementing draft-delany-domainkeys-base-01 X-PHP-List-Original-Sender: pierre.php@gmail.com X-Host-Fingerprint: 72.14.220.156 fg-out-1718.google.com Received: from [72.14.220.156] ([72.14.220.156:43505] helo=fg-out-1718.google.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id F6/B8-09639-B05BF5A4 for ; Thu, 16 Jul 2009 19:17:31 -0400 Received: by fg-out-1718.google.com with SMTP id 13so13434fge.0 for ; Thu, 16 Jul 2009 16:17:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=Njon/5FEJyygWHS+JSXbkGSalE6M7LIrMnWHnpjRPSs=; b=qTcAc1KsI76HzZqRzdihsSMMiaiZoR/H90JlmV7gobevE/Xbdtfr2WZBuEKbPCNCoZ 7rm0NEvk+zV6uuo81M72FcReipNQwTtywck0zWvp2GBdLQE2dWPb5oBkADHqtBUDIpwf JQUctzXIoHSXzpjKf7zk2JLrAn7UmoQhEui4c= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=xOG5bYmR2UIws51PPXSrpNQ+6mZsmmxyNDa/SpvQNEqQ44rtOixsz70zKllIDwWyr6 GROl/BEdoa1gfyKlRP0/SD0SmFTnULC3vvZHqcAtfy4raTQ8Ik33sw1qy8s9AInbngQi FP3tAQuOp15Acp1XG314gURBQJoMnvMzK/yps= MIME-Version: 1.0 Received: by 10.86.3.5 with SMTP id 5mr341307fgc.41.1247786248153; Thu, 16 Jul 2009 16:17:28 -0700 (PDT) In-Reply-To: <4A5FAD73.1060109@tekrat.com> References: <4A5FA493.9040204@lerdorf.com> <4A5FA8B2.1080102@sci.fi> <4A5FAD73.1060109@tekrat.com> Date: Fri, 17 Jul 2009 01:17:28 +0200 Message-ID: To: shire Cc: jani.taskinen@iki.fi, Rasmus Lerdorf , PHP Developers Mailing List Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Subject: Re: [PHP-DEV] svn checkout suggestion From: pierre.php@gmail.com (Pierre Joye) On Fri, Jul 17, 2009 at 12:45 AM, shire 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/MF= B >>> 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? =A0I th= ink > this could speed up development and allow us to have more control over > releases, versions, etc. =A0I've seen cases in the past where changes fal= l > through the cracks because they didn't get manually merged up/down. =A0Th= e > 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, --=20 Pierre http://blog.thepimp.net | http://www.libgd.org