Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:45021 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 71375 invoked from network); 17 Jul 2009 20:06:54 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 17 Jul 2009 20:06:54 -0000 Authentication-Results: pb1.pair.com header.from=jeffg@activestate.com; sender-id=pass Authentication-Results: pb1.pair.com smtp.mail=jeffg@activestate.com; spf=pass; sender-id=pass Received-SPF: pass (pb1.pair.com: domain activestate.com designates 204.244.102.3 as permitted sender) X-PHP-List-Original-Sender: jeffg@activestate.com X-Host-Fingerprint: 204.244.102.3 mx.activestate.com Linux 2.6 Received: from [204.244.102.3] ([204.244.102.3:42858] helo=mx.activestate.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 12/D4-02180-DD9D06A4 for ; Fri, 17 Jul 2009 16:06:54 -0400 Received: from box5.activestate.com (box25.activestate.com [192.168.69.70]) by mx.activestate.com (Postfix) with ESMTP id 287C31803D; Fri, 17 Jul 2009 13:06:51 -0700 (PDT) Received: from [192.168.69.200] (opus.activestate.com [192.168.69.200]) by box5.activestate.com (Postfix) with ESMTP id 71DC5B82D1; Fri, 17 Jul 2009 13:06:50 -0700 (PDT) Message-ID: <4A60D9DA.8050104@activestate.com> Date: Fri, 17 Jul 2009 13:06:50 -0700 User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en-US; rv:1.9.1.1pre) Gecko/20090715 Shredder/3.0b3pre MIME-Version: 1.0 To: Lukas Kahwe Smith CC: Davey Shafik , PHP Developers Mailing List References: <4A5FA493.9040204@lerdorf.com> <4A5FA8B2.1080102@sci.fi> <4A5FAD73.1060109@tekrat.com> <4A5FBF41.8070400@tekrat.com> <4A60B780.7060407@activestate.com> <2897F123-F8B4-4788-8438-EC1B64D687D9@pooteeweet.org> In-Reply-To: <2897F123-F8B4-4788-8438-EC1B64D687D9@pooteeweet.org> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [PHP-DEV] svn checkout suggestion From: jeffg@activestate.com (Jeff Griffiths) On 17/07/09 12:24 PM, Lukas Kahwe Smith wrote: ... > also using merge tracking is only fun if everybody does it .. because if > only some people use it .. they first have to figure out which things > have not been merged via svn merge, as svn merge updates its metadata. > when merging you can either mark an entire range of versisions as merged > .. or just individually. I agree, we have a small team and all use the tool, so it works for us. php-src seems to have a larger number of committers and uses patches from a still-larger set of contributors, so using a tool like svnmerge would require some discipline and polite discussions about what is expected. As mentioned, here is some documentation we wrote internally about using svnmerge with the openkomodo sources: http://anisotropic.net/svnmerge.html ...it should give you an idea of the workflow we use. YMMV of course. Jeff