[Python-3000] p3yk branch and merging (was Re:[Python-3000-checkins] r45619 -python/branches/p3yk/Modules/cjkcodecs/multibytecodec.c)

[Giovanni Bajo]

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

A quick usage guide can be found here:
http://www.ruby-forum.com/topic/61372

and here:
http://www.dellroad.org/svnmerge/index

Incidentally, it also allows to mark revisions that were manually merged
into the trunk from the branch (look into the "svnmerge
merge --record-only"). This means that people can merge in either direction
without making the merge process harder.
-- 
Giovanni Bajo