Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:45020 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 65227 invoked from network); 17 Jul 2009 19:24:34 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 17 Jul 2009 19:24:34 -0000 Authentication-Results: pb1.pair.com smtp.mail=mls@pooteeweet.org; spf=permerror; sender-id=unknown Authentication-Results: pb1.pair.com header.from=mls@pooteeweet.org; sender-id=unknown Received-SPF: error (pb1.pair.com: domain pooteeweet.org from 88.198.8.16 cause and error) X-PHP-List-Original-Sender: mls@pooteeweet.org X-Host-Fingerprint: 88.198.8.16 bigtime.backendmedia.com Linux 2.6 Received: from [88.198.8.16] ([88.198.8.16:43955] helo=bigtime.backendmedia.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 90/A3-02180-2FFC06A4 for ; Fri, 17 Jul 2009 15:24:34 -0400 Received: from localhost (unknown [127.0.0.1]) by bigtime.backendmedia.com (Postfix) with ESMTP id BE4054144059; Fri, 17 Jul 2009 19:26:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at backendmedia.com Received: from bigtime.backendmedia.com ([127.0.0.1]) by localhost (bigtime.backendmedia.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lRTQftVsmfgo; Fri, 17 Jul 2009 21:26:36 +0200 (CEST) Received: from [192.168.0.182] (217-162-131-234.dclient.hispeed.ch [217.162.131.234]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: mls@pooteeweet.org) by bigtime.backendmedia.com (Postfix) with ESMTP id 078E8414400B; Fri, 17 Jul 2009 21:26:34 +0200 (CEST) Cc: Davey Shafik , PHP Developers Mailing List Message-ID: <2897F123-F8B4-4788-8438-EC1B64D687D9@pooteeweet.org> To: Jeff Griffiths In-Reply-To: <4A60B780.7060407@activestate.com> Content-Type: text/plain; charset=WINDOWS-1252; format=flowed; delsp=yes Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Apple Message framework v935.3) Date: Fri, 17 Jul 2009 21:24:26 +0200 References: <4A5FA493.9040204@lerdorf.com> <4A5FA8B2.1080102@sci.fi> <4A5FAD73.1060109@tekrat.com> <4A5FBF41.8070400@tekrat.com> <4A60B780.7060407@activestate.com> X-Mailer: Apple Mail (2.935.3) Subject: Re: [PHP-DEV] svn checkout suggestion From: mls@pooteeweet.org (Lukas Kahwe Smith) On 17.07.2009, at 19:40, Jeff Griffiths wrote: > On 17/07/09 8:31 AM, Davey Shafik wrote: > ... >> More importantly, the branch/merge support in SVN is limited to >> temporary feature/bug branches. You branch, *complete* the feature/=20= >> bug >> fix, and then merge it in. After that, if you decide to carry on in =20= >> your >> branch, SVN's merge tracking cannot handle the tracking of changes. =20= >> You >> need to merge, delete, re-branch, carry on. This doesn't work for =20 >> say, >> the 5.3.x branch fixes getting pushed into trunk, the 5.3.x branch is >> toast as far as SVN is concerned once you merge the first fix =97 = quite >> useless. > > Is it that limited? I hadn't used it ( for a variety of reasons the =20= > server is stuck on SVN 1.4 or something ). We DO use the svnmerge =20 > tool for maintaining dev / stage / production branches for web apps =20= > and versioned branches of things like Komodo. I guess I had assumed =20= > form shire's reply that the svn 1.5.x merge support was a work-=20 > alike, but I haven't ever attempted to use it myself. there is a fat warning fo this in the manual. i dont quite get why . =20 but that is the case atm. also using merge tracking is only fun if everybody does it .. because =20= if only some people use it .. they first have to figure out which =20 things have not been merged via svn merge, as svn merge updates its =20 metadata. when merging you can either mark an entire range of =20 versisions as merged .. or just individually. regards, Lukas Kahwe Smith mls@pooteeweet.org