[42674] branches/release_1_7/base/

[Bryan Blackburn]

On Sat, Nov 29, 2008 at 10:07:53PM -0600, Ryan Schmidt said:
>
> On Nov 29, 2008, at 15:20, Bryan Blackburn wrote:
>
>> On Sat, Nov 29, 2008 at 05:00:52PM +0100, Rainer Müller said:
>>> blb at macports.org wrote:
>>>> Revision
>>>>     42674 <http://trac.macports.org/changeset/42674>
>>>> Author
>>>>     blb at macports.org
>>>> Date
>>>>     2008-11-29 00:09:22 -0800 (Sat, 29 Nov 2008)
>>>>
>>>>
>>>>       Log Message
>>>>
>>>> Initialized merge tracking via "svnmerge" with revisions "1-42672" 
>>>> from
>>>> https://svn.macports.org/repository/macports/trunk/base
>>>
>>> As we got a Subversion server with version 1.5 now, shouldn't we use 
>>> the
>>> integrated merge tracking?
>>
>> Good question, I know how to use svnmerge.py so it wasn't a big deal.
>> Haven't looked at all into the integrated stuff yet.  Obviously this 
>> would
>> require anyone to have svn from someplace other than the default since 
>> 10.5
>> has 1.4.4.
>
> I don't see why anyone using MacPorts wouldn't use the MacPorts  
> subversion since it's newer than what Mac OS X provides.

FYI, since Josh used 'svn merge' for a couple of bits [1,2], I have as well
[3]; fortunately it isn't all that different from svnmerge.py, but doesn't
appear to need to do an init like svnmerge.py.

So at this point use 'svn merge' instead, as I'm sure that
svnmerge-integrated property is now out of date.

Bryan

[1] - <http://trac.macports.org/changeset/42684>
[2] - <http://trac.macports.org/changeset/42698>
[3] - <http://trac.macports.org/changeset/42736>