~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Robert Collins
  • Date: 2009-03-16 05:08:19 UTC
  • mfrom: (4147 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4149.
  • Revision ID: robertc@robertcollins.net-20090316050819-unhkpvsvu3mzaore
NEWS conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1136
1136
            raise AssertionError(
1137
1137
                "fetch_spec and revision_id are mutually exclusive.")
1138
1138
        if self.is_in_write_group():
1139
 
            raise errors.BzrError("May not fetch while in a write group.")
 
1139
            raise errors.InternalBzrError(
 
1140
                "May not fetch while in a write group.")
1140
1141
        # fast path same-url fetch operations
1141
1142
        if self.has_same_location(source) and fetch_spec is None:
1142
1143
            # check that last_revision is in 'from' and then return a