Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:29993 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 33437 invoked by uid 1010); 31 May 2007 09:38:39 -0000 Delivered-To: ezmlm-scan-internals@lists.php.net Delivered-To: ezmlm-internals@lists.php.net Received: (qmail 33422 invoked from network); 31 May 2007 09:38:39 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 31 May 2007 09:38:39 -0000 Authentication-Results: pb1.pair.com header.from=cschneid@cschneid.com; sender-id=unknown Authentication-Results: pb1.pair.com smtp.mail=cschneid@cschneid.com; spf=permerror; sender-id=unknown Received-SPF: error (pb1.pair.com: domain cschneid.com from 195.226.6.51 cause and error) X-PHP-List-Original-Sender: cschneid@cschneid.com X-Host-Fingerprint: 195.226.6.51 darkcity.gna.ch Linux 2.6 Received: from [195.226.6.51] ([195.226.6.51:48414] helo=mail.gna.ch) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 62/92-13361-B979E564 for ; Thu, 31 May 2007 05:38:37 -0400 Received: from localhost (localhost [127.0.0.1]) by darkcity.gna.ch (Postfix) with ESMTP id 39841B3848; Thu, 31 May 2007 11:38:33 +0200 (CEST) Received: from unknown by localhost (amavisd-new, unix socket) id client-XXKQabol; Thu, 31 May 2007 11:38:31 +0200 (CEST) Received: from box.local (217-162-168-28.dclient.hispeed.ch [217.162.168.28]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by darkcity.gna.ch (Postfix) with ESMTP id 6E9FFB382B; Thu, 31 May 2007 11:38:31 +0200 (CEST) Message-ID: <465E9797.40706@cschneid.com> Date: Thu, 31 May 2007 11:38:31 +0200 User-Agent: Thunderbird 2.0.0.0 (Macintosh/20070326) MIME-Version: 1.0 To: Stefan Walk CC: PHP Internals List References: <4e89b4260705280856t47429e54ofcc182e02a6627e5@mail.gmail.com> <1237063851.20070530094541@marcus-boerger.de> <465D2FB0.5060308@lerdorf.com> <014601c7a293$3e047440$39dc2f52@foxbox> <465D35D2.4050001@lerdorf.com> <1180530241.3496.13.camel@localhost.localdomain> <465D90D3.1090601@lerdorf.com> <698DE66518E7CA45812BD18E807866CE418708@us-ex1.zend.net> <465E85E6.70304@lerdorf.com> <4858f9d90705310158v464c5e15o12df04eb7d3eb6@mail.gmail.com> In-Reply-To: <4858f9d90705310158v464c5e15o12df04eb7d3eb6@mail.gmail.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Scanned: amavisd-new at gna.ch Subject: Re: [PHP-DEV] better changeset tracking From: cschneid@cschneid.com (Christian Schneider) Stefan Walk wrote: > At the moment, SVN is a pain in the ass when it comes to merging, but > they claim that it's fixed in 1.5... svnmerge.py: http://www.orcaware.com/svn/wiki/Svnmerge.py can help quite a lot as it maintains merges. And as it stores the merge information in SVN properties I'm sure the information can be converted to something suitable to use with the SVN 1.5 mechanism. Having looked at git and others I'm still happy with our move to SVN as it is almost a drop-in replacement for CVS (substitute cvs for svn on the command line) for a lot of common operations. - Chris