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

  • Committer: Aaron Bentley
  • Date: 2006-03-18 23:40:51 UTC
  • mto: This revision was merged to the branch mainline in revision 1615.
  • Revision ID: aaron.bentley@utoronto.ca-20060318234051-415e5fcb51da82e4
Allow merge against self, make fetching self a noop

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
227
227
                self.base_rev_id = None
228
228
            else:
229
229
                self.base_rev_id = base_branch.get_rev_id(base_revision[1])
230
 
            self.this_branch.fetch(base_branch)
 
230
            if self.this_branch.base != base_branch.base:
 
231
                self.this_branch.fetch(base_branch)
231
232
            self.base_is_ancestor = is_ancestor(self.this_basis, 
232
233
                                                self.base_rev_id,
233
234
                                                self.this_branch)