On 4/21/06, Giovanni Bajo <rasky at develer.com> wrote: >> Thomas Wouters wrote: >> >> And just so everyone knows: done right, merging isn't hard. It's not > >> as easy as it could be, but 'svn merge' makes it a lot easier than > >> it used to be in CVS. Here's how you do it: > >> [...] >> It can be much much easier than this: SVN 1.3 ships with a client-side > tool > called svnmerge.py, which implements merge-tracking. Latest (improved) > version is here: > http://svn.collab.net/repos/svn/trunk/contrib/client-side/svnmerge.py Ah. Does it require a particular version of the server or client? I can't seem to find that information anywhere. If it doesn't, and everyone who does (or would do) branch merging can live with a python script for merging branches, let's use that instead. :) -- Thomas Wouters <thomas at python.org> Hi! I'm a .signature virus! copy me into your .signature file to help me spread! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.python.org/pipermail/python-3000/attachments/20060421/452c4416/attachment.htm