Re: Merge properties in svnmerge.py and 1.5.x

On Thu, 08 Nov 2007, John Peacock wrote:

> I've only been keeping half an ear open to the merge discussion. Can I
> confirm that that the properties created by the svnmerge.py script are
> equivalent to the properties created by the 1.5.x client? That is to
> say, if we integrate our use of svnmerge.py into our Trac environment,
> we won't have to go through it all again when 1.5.x comes out.

John, you'll use this migration script to convert svnmerge.py's merge
history format into Subversion 1.5's:

http://svn.collab.net/repos/svn/trunk/contrib/client-side/svnmerge/svnmerge-migrate-history.py