Julian Foad wrote on Tue, May 03, 2011 at 14:31:47 +0100:
> + # Check recursive info.
> + # ### This is currently dependent on ordering of the dict entries.
> + expected_infos = [{ 'Path' : r'.*[/\\]G' }]
> for fname, action, reason in scenarios:
> + expected_str = ".*local %s, incoming %s.*" % (reason, action)
> + expected_infos.append({ 'Name' : fname,
> + 'Tree conflict' : expected_str })
I guess you want re.escape() here, at least for fname. (Formally you
need it for expected_str too, unless you rely on knowing that REASON and
ACTION don't contain regex metachars.)
