/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

Better assertion message from InterDirStateTree._iter_changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
1405
1405
                require_versioned):
1406
1406
                yield f
1407
1407
            return
1408
 
        assert (self.source._revision_id in self.target.get_parent_ids())
 
1408
        assert (self.source._revision_id in self.target.get_parent_ids()), \
 
1409
                "revision {%s} is not stored in {%s}, but %s " \
 
1410
                "can only be used for trees stored in the dirstate" \
 
1411
                % (self.source._revision_id, self.target, self._iter_changes)
1409
1412
        parents = self.target.get_parent_ids()
1410
1413
        target_index = 0
1411
1414
        source_index = 1 + parents.index(self.source._revision_id)