[42674] branches/release_1_7/base/

[Rainer Müller]

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?

variants-descs-14482 was still using svnmerge.py as I started the branch
before 1.5 was available.

Rainer