[Svnmerge] Experiences with svn/svnmerge; supporting tools around svn/svnmerge

Hermanns, Horst h.hermanns at telekom.de
Fri May 30 05:09:34 PDT 2008


Hi Mike,

thanks for the answer, I see you are struggling with the same problems.

One comment to conflicts on 'svnmerge-integrated' and
'svnmerge-blocked'.

We had same problems and found a Problem in svnmerge concerning handling
of revision numbers.
See Revision 30180:
 svnmerge.py: Fix a problem occasionally causing conflicts in the
integrated
 property due to some revisions being treated by svnmerge.py as unicode
 strings, and others as int's.

Best regards
Horst





More information about the Svnmerge mailing list