[Svnmerge] Directory conflicts, unicode values in array self.revs

[Giovanni Bajo]

On 4/2/2008 7:18 AM, Raman Gupta wrote:

> Index: svnmerge.py
> ===================================================================
> --- svnmerge.py (revision 30175)
> +++ svnmerge.py (working copy)
> @@ -869,7 +869,7 @@
>          def __init__(self, xmlnode):
>              self.n = xmlnode
>          def revision(self):
> -            return self.n.getAttribute("revision")
> +            return int(self.n.getAttribute("revision"))
>          def author(self):
>              return
> self.n.getElementsByTagName("author")[0].firstChild.data
>          def paths(self):
> @@ -1195,7 +1195,7 @@
>              # which created the merge source:
>              report('the source "%s" is a branch of "%s"' %
>                     (opts["source-url"], target_dir))
> -            revision_range = "1-" + copy_committed_in_rev
> +            revision_range = "1-" + str(copy_committed_in_rev)
>          else:
>              # If the copy source is the merge source, and
>              # the copy target is the merge target, then we want to

Fine by me.
-- 
Giovanni Bajo
Develer S.r.l.
http://www.develer.com