Hi, Philip, Von: Philip Martin [mailto:philip.mar...@wandisco.com] >Daniel Shahaf <d...@daniel.shahaf.name> writes: > >> phi...@apache.org wrote on Mon, Feb 20, 2012 at 23:37:52 -0000: >>> + # The different orders of the real and dry-run merges may cause >>> + # the "Merging rX through rY into" lines to be duplicated a >>> + # different number of times in the two outputs. The list-set-list >>> + # conversion removes duplicates so these differences are ignored. >>> + # It also removes "U some/path" duplicate lines. Perhaps we >>> + # should avoid that? >>> + out_copy = list(set(out_copy)) >>> + out_dry_copy = list(set(out_dry_copy)) >>> + >>> if out_copy != out_dry_copy: >> >> You're converting sets->lists and then comparing them. Shouldn't you >> either sort the new lists before comparing them, or just avoid the >> list step altogether?
>Indeed, I realised that last night. I don't think I need to sort them at all, >simply >convert the unsorted lists with duplicates into sets and compare them. > That's assuming >Python allows me to compare sets. Using ActivePython 2.7.2.5: >>> d = {1:2,3:4} >>> e = {3:4,1:2} >>> f = {1:2,3:4,5:6} >>> d == d True >>> d == e True >>> d == f False -- uberSVN: Apache Subversion Made Easy http://www.uberSVN.com Best regards Markus Schaber -- ___________________________ We software Automation. 3S-Smart Software Solutions GmbH Markus Schaber | Developer Memminger Str. 151 | 87439 Kempten | Germany | Tel. +49-831-54031-0 | Fax +49-831-54031-50 Email: m.scha...@3s-software.com | Web: http://www.3s-software.com CoDeSys internet forum: http://forum.3s-software.com Download CoDeSys sample projects: http://www.3s-software.com/index.shtml?sample_projects Managing Directors: Dipl.Inf. Dieter Hess, Dipl.Inf. Manfred Werner | Trade register: Kempten HRB 6186 | Tax ID No.: DE 167014915