[MERGE][bug 104257] Fix _iter_changes to handle unknowns in a previously empty versioned directory

[Robert Collins]

Robert Collins has voted +1 (conditional).
Status is now: Conditionally approved
Comment:

+        # Create an empty directory 'a', followed by a directory with 
content
+        # 'b'.
+        self.build_tree(['tree1/a/', 'tree1/b/'])
+        self.build_tree_contents([('tree1/b/file', 'contents\n')])
+        self.build_tree(['tree2/a/', 'tree2/b/'])
+        self.build_tree_contents([('tree2/b/file', 'contents\n')])

as the content doesn't matter, this would be simpler as
self.build_tree(['tree1/a/', 'tree1/b/', 'tree1/b/file',
                  'tree2/a/', 'tree2/b/', 'tree2/b/file',
                  'tree2/a/file', 'tree2/a/dir/', tree2/a/dir/subfile'])

I'm not clear on the last hunk: it looks wrong to remove the if 
want_unversioned guard around that code block - why is it wrong to leave 
it there?

Other than that, +1.

For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3C461D22F0.7060606%40arbash-meinel.com%3E