r870254 | rocketraman | 2008-04-02 13:39:25 +0000 (Wed, 02 Apr 2008) 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. * contrib/client-side/svnmerge/svnmerge.py (SvnLogParser): Always return revisions as ints. (action_init): Cast revision to str before concatenation. Found by: Horst Hermanns <h.hermanns@telekom.de> Patch by: Horst Hermanns <h.hermanns@telekom.de> me Review by: Giovanni Bajo <rasky@develer.com>