/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: Aaron Bentley
  • Date: 2007-02-09 07:12:55 UTC
  • mto: (2255.6.1 dirstate)
  • mto: This revision was merged to the branch mainline in revision 2322.
  • Revision ID: aaron.bentley@utoronto.ca-20070209071255-74pex0pbd0gelb1u
Get merge working initially

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
815
815
            merger.other_basis = merger.other_rev_id
816
816
            merger.other_tree = self.branch.repository.revision_tree(
817
817
                merger.other_rev_id)
 
818
            merger.other_branch = branch
818
819
            merger.pp.next_phase()
819
820
            merger.find_base()
820
821
            if merger.base_rev_id == merger.other_rev_id: