Hi, Svnmerge.py works fine with svn 1.5. You will not have any problems because the merge tracking property has a different name in svn 1.5 and svnmerge.py. Svn 1.5 lacks some functionality of svnmerge.py like blocking revisions.
The blame functionality works if you let developers merge their own changesets. I don't think CM should do that because the developers have the knowledge of the changes made. Regards, Piet-Hein Peeters Software Configuration Manager ---------------------------------------------------------------------------- Philips Healthcare - Healthcare Informatics / PII Room QV-136, P.O. Box 10.000, NL - 5680 DA Best Phone +31 40 27 62016 Fax +31 40 27 62379 ---------------------------------------------------------------------------- From: [email protected] [mailto:[email protected]] On Behalf Of Erik Andersson Sent: 2009 Jan 12 11:59 AM To: [email protected] Subject: [Svnmerge] Svnmerge.py and Subversion 1.5 Hi 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 experiences. 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 ________________________________ The information contained in this message may be confidential and legally protected under applicable law. The message is intended solely for the addressee(s). If you are not the intended recipient, you are hereby notified that any use, forwarding, dissemination, or reproduction of this message is strictly prohibited and may be unlawful. If you are not the intended recipient, please contact the sender by return e-mail and destroy all copies of the original message.
_______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
