On 4/21/06, Giovanni Bajo <[EMAIL PROTECTED]> wrote:
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 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 <[EMAIL PROTECTED]>
Hi! I'm a .signature virus! copy me into your .signature file to help me spread!
_______________________________________________ Python-3000 mailing list Python-3000@python.org http://mail.python.org/mailman/listinfo/python-3000 Unsubscribe: http://mail.python.org/mailman/options/python-3000/archive%40mail-archive.com
