← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-12-03 08:31:44 UTC
  • mfrom: (4597.14.11 638451-malformed)
  • Revision ID: pqm@pqm.ubuntu.com-20101203083144-b2qfwgifwp1wq6zv
(vila) Implement resolve --take-this and --take-other for text conflicts.
 (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
130
130
            self._new_root = self.trans_id_tree_file_id(root_id)
131
131
        else:
132
132
            self._new_root = None
133
 
        # Indictor of whether the transform has been applied
 
133
        # Indicator of whether the transform has been applied
134
134
        self._done = False
135
135
        # A progress bar
136
136
        self._pb = pb