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?
sorted(list(set(x))) == sorted(list(set(y)))
set(x) == set(y)
> print("=============================================================")
> print("Merge outputs differ")
>
>
