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

John Arbash Meinel john at arbash-meinel.com
Fri Apr 13 15:42:44 BST 2007


Robert Collins wrote:
> On Thu, 2007-04-12 at 20:44 -0500, John Arbash Meinel wrote:
>>
>> So do you think it is better to have an extra change in the
>> _iter_changes, to make the setup more obvious? 
> 
> Uhm no :). But a note to that effect wont hurt.
> 
> -Rob

I did change it a little, to be:

        # Start with 2 identical trees
        self.build_tree(['tree1/a/', 'tree1/b/',
                         'tree2/a/', 'tree2/b/'])
        self.build_tree_contents([('tree1/b/file', 'contents\n')
                                  ('tree2/b/file', 'contents\n')
                                 ])
        tree1.add(['a', 'b', 'b/file'], ['a-id', 'b-id', 'b-file-id'])
        tree2.add(['a', 'b', 'b/file'], ['a-id', 'b-id', 'b-file-id'])

        # Now create some unknowns in tree2
...

Thanks for the clarification tip.

John
=:->



More information about the bazaar mailing list