[Svnmerge] svnmerge vs. Subversion 1.6 merge

[Blair Zajac]

On May 23, 2011, at 11:28 PM, anatoly techtonik wrote:

> Hi,
>
> Is there any feature comparison between svnmerge.py and `svn merge`
> from 1.6 merge tracking?

The major differences are:

	svn merge
		Does per-file merging
		Does not block revisions, need to fake it
	svnmerge.py
		No per-file merge tracking, only per revision
		svnmerge.py block and unblock supported

>
> What do we lose if we switch to `svn merge`? How can we do this?

If you don't block, then not a lot.

See these scripts to migrate:

https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/svnmerge/svnmerge-migrate-history.py
https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py

I haven't used them myself.

Regards,
Blair

--
Blair Zajac, Ph.D.
CTO, OrcaWare Technologies
<blair at orcaware.com>
Subversion training, consulting and support
http://www.orcaware.com/svn/