[37504] users/rhwood

[Blair Zajac]

Ryan Schmidt wrote:
> On Jun 10, 2008, at 05:48, rhwood at macports.org wrote:
> 
>> Revision: 37504
>>           http://trac.macosforge.org/projects/macports/changeset/37504
>> Author:   rhwood at macports.org
>> Date:     2008-06-10 03:48:38 -0700 (Tue, 10 Jun 2008)
>>
>> Log Message:
>> -----------
>> Branch trunk/www for development
>>
>> Modified Paths:
>> --------------
>>     users/rhwood/macports-www/includes/common.inc
>>     users/rhwood/macports-www/includes/header.inc
>>     users/rhwood/macports-www/macports.css
>>
>> Added Paths:
>> -----------
>>     users/rhwood/macports-www/
>>     users/rhwood/macports-www/img/rss.png
>>     users/rhwood/macports-www/img/spinner_small.gif
>>     users/rhwood/macports-www/includes/portindex.php
>>     users/rhwood/macports-www/includes/rss.php
>>     users/rhwood/macports-www/includes/search.php
>>     users/rhwood/macports-www/port.php
>>
>> Copied: users/rhwood/macports-www (from rev 37499, trunk/www)
> 
> If you branch and make changes to the branch in a single commit,  
> doesn't that make it hard to merge the changes back later? Or does  
> svnmerge.py handle that? (I haven't used svnmerge; I've only merged  
> manually, and I know it is a problem then.)

Yes, the copy should be a single commit with no modifications to it.

Blair