~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/dirstate.py

• browse files at revision 6437.40.2
• compare with another revision
• compare with revision 6437.40.2
• download diff
• download tarball
• view history from revision 6437.40.2

Show diffs side-by-side

added

removed

bzrlib/dirstate.py

1292

1292

                    parent_trees.append((parent_id, parent_tree))

1293

1293

                    parent_tree.lock_read()

1294

1294

                result.set_parent_trees(parent_trees, [])

1295

 

                result.set_state_from_inventory(tree.inventory)

 

1295

                result.set_state_from_inventory(tree.root_inventory)

1296

1296

            finally:

1297

1297

                for revid, parent_tree in parent_trees:

1298

1298

                    parent_tree.unlock()

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1