← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_workingtree.py

Now all tests matching dirstate pass - added generation of inventories for parent trees.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_workingtree.py
331
331
        # set the parents as if a merge had taken place. 
332
332
        # this should cause the tree data to be folded into the 
333
333
        # dirstate.
334
 
        ## import pdb;pdb.set_trace()
335
334
        tree.set_parent_trees([
336
335
            (rev1, rev1_tree),
337
336
            (rev2, rev2_tree),