From: David Walthall (walthall_at_[hidden])
Date: 2008-06-30 12:33:27
Daryle Walker wrote:
> 5. Once we transition fully to 1.5, members should branch/merge with
> the native-1.5 system for NEW branches. Members with 1.4-clients need
> to upgrade to a 1.5-client to have merge control[1]. Existing branches
> should retain the 1.4/svnmerge system (so 1.5-clients need to download
> the script), but should wrap up their lifetimes as soon as possible to
> reduce the mix of branch/merge systems. (I don't think members should
> kill a 1.4/svnmerge system and immediately resurrect it as native-1.5.)
Once we fully transition to 1.5, we can use svnmerge-migrate-history.py
to convert svnmerge.py's history to the 1.5 merge history format:
http://svn.collab.net/repos/svn/trunk/contrib/client-side/svnmerge/svnmerge-migrate-history.py
David