[Svnmerge] Svnmerge.py and Subversion 1.5
h.hermanns at telekom.de
Thu Jan 15 08:39:55 PST 2009
we tried to use svnmerge with subversion 1.5 (server) an run into
problems because of property conflicts.
Subversion 1.5 creates parallel its own merge properties (no way to
prevent this). Svnmerge does handle "his" merge properties during a
merge in an special way to prevent conflicts but this does not affect
the new merge properties.
We decided not to use svnmerge with Subversion 1.5. and decided to ceate
a merge plugin for eclipse (subclipse) to handle merges similar to
svnmerge (prevent bidirectional/repeated merges, ...) based on the new
Cheers / Horst
From: svnmerge-bounces+h.hermanns=telekom.de at orcaware.com
[mailto:svnmerge-bounces+h.hermanns=telekom.de at orcaware.com] On Behalf
Of Erik Andersson
Sent: Thursday, January 15, 2009 12:48 PM
To: svnmerge at orcaware.com
Subject: Re: [Svnmerge] Svnmerge.py and Subversion 1.5
Will an upgrade to svn 1.5 still work with svnmerge.py?
On Mon, Jan 12, 2009 at 11:58 AM, Erik Andersson <kirean at gmail.com>
We are currently using svnmerge.py and I'm very happy with it.
Some developers are though complaining about the blame function beeing
messed up since it's the CM that owns a lot of changes due to the
merges. I looked at upgrading to svn 1.5, but the merge tracking seems
to lack some functionality like blocking changesets. Also, we do cyclic
merges and svn 1.5 seems to make that complicated.
Is there anyone else who have decided not to use the merge
tracking in svn 1.5 and stick to using svnmerge.py? Please share your
If we upgrade to svn 1.5, will svnmerge.py work as fine as
before? I'm guessing I won't get the blame functionality properly though
if I still use svnmerge.py..
Cheers / Erik
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the Svnmerge