Rev 6060: Clean things up a bit. in http://bazaar.launchpad.net/~jameinel/bzr/2.4-dirstate-invalid-delta-855155

John Arbash Meinel john at arbash-meinel.com
Wed May 29 06:02:42 UTC 2013


At http://bazaar.launchpad.net/~jameinel/bzr/2.4-dirstate-invalid-delta-855155

------------------------------------------------------------
revno: 6060
revision-id: john at arbash-meinel.com-20130529060235-d7rpolm1tx7t55ok
parent: john at arbash-meinel.com-20130529060009-mmt09o6li47f05r5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.4-dirstate-invalid-delta-855155
timestamp: Wed 2013-05-29 07:02:35 +0100
message:
  Clean things up a bit.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_dirstate.py'
--- a/bzrlib/tests/test_dirstate.py	2013-05-29 06:00:09 +0000
+++ b/bzrlib/tests/test_dirstate.py	2013-05-29 06:02:35 +0000
@@ -2477,7 +2477,6 @@
     def create_tree_from_shape(self, rev_id, shape):
         dir_ids = {'': 'root-id'}
         inv = inventory.Inventory('root-id', rev_id)
-        #for path, file_id in shape:
         for info in shape:
             if len(info) == 2:
                 path, file_id = info
@@ -2533,7 +2532,6 @@
         state.set_state_from_scratch(active_tree.inventory,
             [('basis', basis_tree)], [])
         delta = target_tree.inventory._make_delta(basis_tree.inventory)
-        import pdb; pdb.set_trace()
         state.update_basis_by_delta(delta, 'target')
         state._validate()
         dirstate_tree = workingtree_4.DirStateRevisionTree(state,



More information about the bazaar-commits mailing list