← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/changeset.py

  • Committer: Martin Pool
  • Date: 2005-07-15 22:55:10 UTC
  • Revision ID: mbp@sourcefrog.net-20050715225510-ebb2753f499f71e5
- add more test cases for weave_merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/changeset.py
1529
1529
 
1530
1530
 
1531
1531
        
1532
 
# XXX: Can't we unify this with the regular inventory object
 
1532
    
1533
1533
class Inventory(object):
1534
1534
    def __init__(self, inventory):
1535
1535
        self.inventory = inventory