[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: What is status of svnmerge?

From: Emin.shopper Martinian.shopper <emin.shopper_at_gmail.com>
Date: 2007-07-20 21:59:02 CEST

> 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?

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.

Received on Fri Jul 20 21:58:16 2007

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.