Re: What is status of svnmerge?

Emin.shopper Martinian.shopper wrote:
>
> Svnmerge.py is hosted in the Subversion source code repository itself
> and comes in the tarball, so it doesn't need to be downloaded
> separately.
>
>
> What if you install the windows version? Where is svnmerge in that case?

Well, you need Python to run svnmerge.py, so it wouldn't be appropriate for the
Windows installer to install that. Also, there's many addon tools to
Subversion, and I'm pretty sure none of them come with the installer .exe.

So you need to go to the website and download the tools yourself:

Latest versions, may not all work with 1.4.x:
http://svn.collab.net/repos/svn/trunk/contrib/
http://svn.collab.net/repos/svn/trunk/tools/

Older versions, will work with 1.4.x, but may be lacking newer features:
http://svn.collab.net/repos/svn/branches/1.4.x/contrib/
http://svn.collab.net/repos/svn/branches/1.4.x/tools/

> No, svnmerge.py is great, the only thing is that it's not built into
> Subversion itself. We don't believe the merging in 1.4 is good enough
> and 1.5 will have built-in merge tracking support, that extends the
> svnmerge.py feature set in some areas and leaving some other features
> for 1.6.
>
>
> Great, I'm looknig forward to that. While svnmerge is a great idea, it
> doesn't seem very robust as currently implemented. I seem to constantly
> get conflicts about the svnmerge-integrated property, "Out of Date"
> errors, and other problems.

Yes, there are people working on that.

If you're interested, take a look at the svnmerge mailing list:

http://www.orcaware.com/mailman/listinfo/svnmerge

You may want to join and follow the discussions there.

Regards,
Blair

--
Subversion training, consulting and support
http://www.orcaware.com/svn/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org