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

[Hermanns, Horst]

Raman Gupta wrote:
>25683 would be the rev where the bug manifests itself but it isn't the
cause of the mixed unicode/non-unicode values. We now at least know that
the >underlying problem has been around for a while and has not been
introduced recently.
>
>Any chance you can provide a reproducible test script for this problem?


I'm not so familiar with the svnmerge_test.py, so I made a Shell-Script
to reproduce the problem.

Scenario:
	- Checkout a Test-Repo (URL 'TESTREPO' in script header)
	- Create a Base-Dir BASE
	- copy BASE to bra1/bra2/bra3 and initialise merge tracking
	- make changes in bra2 and merge back to BASE
	- make changes in bra1 and merge back to BASE (only to create
non continuous revisions)
	- make changes in bra3 and merge back to BASE
	- merge changes in BASE to bra1 -> create conflict

Additonally I added follwing Debug-Output to svnmerge.py
   519              # Find the index using a binary search
   520              i = bisect(self.revs, rev) - 1
   521
   522 +            print "Output self.revs and i"
   523 +            print self.revs
   524 +            print i

Please find attached the script and a output-log
(svnmerge_unicode_test.sh, output_conflict_unicode.log). The Output of
self.revs and index starts at line 200.
	...
	Output self.revs and i
	[0, 723, u'730', u'731', u'732', u'734', u'736', u'738', 739]
	1
	...

I've made a second run with type change of self.revs (for ...,
self.revs[revi]=int(self.revs[revi]). No errors occur with this version.
See 'output_type_change.log'.
	...
	Output self.revs and i
	[0, 706, 713, 714, 715, 717, 719, 721, 722]
	4
	...

I hope this will help to solve the problem.


Thanks and Cheers
Horst

-------------- next part --------------
A non-text attachment was scrubbed...
Name: svnmerge_confl_error.zip
Type: application/x-zip-compressed
Size: 3257 bytes
Desc: svnmerge_confl_error.zip
URL: </pipermail/svnmerge/attachments/20080318/8fdd62f7/attachment-0002.bin>