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


_______________________________________________
Svnmerge mailing list
[email protected]
http://www.orcaware.com/mailman/listinfo/svnmerge

Reply via email to