/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: Neil Martinsen-Burrell
  • Date: 2012-07-02 05:34:48 UTC
  • mto: This revision was merged to the branch mainline in revision 6545.
  • Revision ID: nmb@wartburg.edu-20120702053448-thc0rbh1w1q89pyy
address review comments

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
534
534
        else:
535
535
            # TODO now merge from tree.last_revision to revision (to preserve
536
536
            # user local changes)
537
 
            merge.transform_tree(tree, 
 
537
            merge.transform_tree(tree,
538
538
                self.branch.repository.revision_tree(revision_id))
539
539
            if revision_id == _mod_revision.NULL_REVISION:
540
540
                new_parents = []