/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.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-04-07 21:11:44 UTC
  • mfrom: (1558.7.13 bzr.spurious-conflict)
  • Revision ID: pqm@pqm.ubuntu.com-20060407211144-0d74356b1cc77c00
Reduced spurious conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1132
1132
        from transform import revert
1133
1133
        if old_tree is None:
1134
1134
            old_tree = self.basis_tree()
1135
 
        revert(self, old_tree, filenames, backups, pb)
 
1135
        conflicts = revert(self, old_tree, filenames, backups, pb)
1136
1136
        if not len(filenames):
1137
1137
            self.set_pending_merges([])
 
1138
        return conflicts
1138
1139
 
1139
1140
    @needs_write_lock
1140
1141
    def set_inventory(self, new_inventory_list):