[Python-checkins] Problem with py3k folder property

[Tarek Ziadé]

Hey Senthil,

There's something broken in the properties in the py3k branch. I've
tried to merge a commit and I had:

$ svnmerge.py merge -i -n -r75485
Traceback (most recent call last):
  File "/usr/sbin/svnmerge.py", line 2366, in <module>
    main(sys.argv[1:])
  File "/usr/sbin/svnmerge.py", line 2358, in main
    opts["source-pathid"])
  File "/usr/sbin/svnmerge.py", line 828, in merge_props_to_revision_set
    return RevisionSet(merge_props[pathid])
  File "/usr/sbin/svnmerge.py", line 749, in __init__
    self._revs[int(rev_or_revs[0])] = 1
ValueError: invalid literal for int() with base 10: '75470>>>>>>>'

Looks like the property contains now a unresolved conflict, it seems
to happen at rev. 75476

$ svn di -r75475:75476 .
<... shows the problem here ...>


Regards
Tarek


-- 
Tarek Ziadé | http://ziade.org | オープンソースはすごい! | 开源传万世，因有你参与