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

Merge bzr.dev and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/revisionspec.py
160
160
 
161
161
        if spec is None:
162
162
            return RevisionSpec(None, _internal=True)
163
 
 
164
 
        assert isinstance(spec, basestring), \
165
 
            "You should only supply strings not %s" % (type(spec),)
166
 
 
167
163
        for spectype in SPEC_TYPES:
168
164
            if spec.startswith(spectype.prefix):
169
165
                trace.mutter('Returning RevisionSpec %s for %s',
771
767
        other_branch = Branch.open(self.spec)
772
768
        last_revision = other_branch.last_revision()
773
769
        last_revision = revision.ensure_null(last_revision)
 
770
        context_branch.fetch(other_branch, last_revision)
774
771
        if last_revision == revision.NULL_REVISION:
775
772
            raise errors.NoCommits(other_branch)
776
773
        return last_revision