[Python-Dev] Subversion 1.5 and better merge support (original) (raw)

Benjamin Peterson musiccomposition at gmail.com
Mon Jul 21 15:16:31 CEST 2008

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.

-- Cheers, Benjamin Peterson "There's no place like 127.0.0.1."

More information about the Python-Dev mailing list