/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/branch.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/branch.py
197
197
        (copied, failures).
198
198
        """
199
199
        if self.base == from_branch.base:
200
 
            raise Exception("can't fetch from a branch to itself %s, %s" % 
201
 
                            (self.base, to_branch.base))
 
200
            return (0, [])
202
201
        if pb is None:
203
202
            nested_pb = bzrlib.ui.ui_factory.nested_progress_bar()
204
203
            pb = nested_pb