Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:45001
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: error (pb1.pair.com: domain tekrat.com from 208.43.138.18 cause and error)
Message-ID: <4A5FB187.3000401@tekrat.com>
Date: Thu, 16 Jul 2009 16:02:31 -0700
User-Agent: Postbox 1.0b13 (Macintosh/2009062916)
MIME-Version: 1.0
To: Jeff Griffiths <jeffg@activestate.com>
CC: PHP Developers Mailing List <internals@lists.php.net>
References: <4A5FA493.9040204@lerdorf.com> <4A5FA8B2.1080102@sci.fi> <4A5FAD73.1060109@tekrat.com> <4A5FB051.2030207@activestate.com>
In-Reply-To: <4A5FB051.2030207@activestate.com>
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)

Jeff Griffiths wrote:
> On 16/07/09 3:45 PM, shire wrote:
> ...
>> 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.
>
> I'd suggest looking into the svnmerge tool:
>
> http://www.orcaware.com/svn/wiki/Svnmerge.py
>
> We use it quite a bit at ActiveState to migrate changes from developer
> branches into trunk, and then into production. I would caution that the
> merge actions might not be to everyone's taste, so you might want to
> either encourage use or ban use depending on your preference.
>
> We have some quite excellent Komodo-specific documentation a co-worker
> wrote on how to use this tool for developer branches specifically; I
> could see about providing this to someone if they want to try svnmerge out.


This sounds very similar to what the latest versions of SVN has already done, specifically merge tracking.  You should now be able to use the 'svn merge' command and have it track changes for you across branches so you don't have to worry about merging the same rev twice etc.

-shire