[Python-Dev] Subversion 1.5 and better merge support

[Brett Cannon]

On Mon, Jul 21, 2008 at 6:16 AM, Benjamin Peterson
<musiccomposition at gmail.com> wrote:
> On Mon, Jul 21, 2008 at 5:07 AM, Jesus Cea <jcea at jcea.es> wrote:
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA1
>>
>> Subversion 1.5 solves the "repeated merge" problem. At last!!.
>>
>> Somebody is considering upgrading python svn to 1.5, and allowing only
>> commits coming from 1.5 clients?.
>
> While Subversion 1.5 has merge tracking, it doesn't support blocking
> revisions to be merged as well as svnmerge.py. (This is important for
> merging trunk -> py3k). Basically, I think we can get more from
> svnmerge.py than builtin merge tracking.
>

This has also been discussed by the infrastructure committee and the
person in charge of maintaining the svn install does not want to
upgrade until 1.5 lands in debian-stable. So as of right now there are
no immediate plans to upgrade.

-Brett