Don't worry , William. I just fixed the svnmerge-integrated property of camel-1.x root directory by hand.
It looks someone committed a massed svnmerge-integrated property few days ago. BTW, you can check the svnmerge-integrated property by running this command on the root. svn pg svnmerge-integrated . Willem William Tam wrote: > Hi all, > > I am having problem with svnmerge. I might have messed up one of the > properties. Any idea? > > Thanks, > William > > w...@lenw500:~/repos/apache/camel/camel-1.x$ svnmerge merge -r 759362 > -S https://svn.apache.org/repos/asf/camel/trunk/ > Traceback (most recent call last): > File "/usr/bin/svnmerge", line 2162, in <module> > main(sys.argv[1:]) > File "/usr/bin/svnmerge", line 2154, in main > opts["source-pathid"]) > File "/usr/bin/svnmerge", line 665, in merge_props_to_revision_set > return RevisionSet(merge_props[pathid]) > File "/usr/bin/svnmerge", line 586, in __init__ > self._revs[int(rev_or_revs[0])] = 1 > ValueError: invalid literal for int() with base 10: '758692>>>>>>>' >
