/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: Gerard Krol
  • Date: 2010-02-02 18:15:42 UTC
  • mto: (5020.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5021.
  • Revision ID: gerard_@gna.org-20100202181542-xue58s72o8jbbop7
should pass all tests again

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
2311
2311
                    or basis.inventory.root.file_id != to_root_id):
2312
2312
                    self.set_root_id(to_root_id)
2313
2313
                    self.flush()
2314
 
                if update_dash_r:
2315
 
                    # update -r doesn't play by the rules, and may get rid of local commits
 
2314
                if not already_merged:
2316
2315
                    base_tree = basis
2317
2316
                else:
2318
2317
                    graph = self.branch.repository.get_graph()