~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

[merge] Erik Bågfors: add --revision to bzr pull

Show diffs side-by-side

added added

removed removed

Lines of Context:
745
745
                yield stem
746
746
 
747
747
    @needs_write_lock
748
 
    def pull(self, source, overwrite=False):
 
748
    def pull(self, source, overwrite=False, stop_revision=None):
749
749
        from bzrlib.merge import merge_inner
750
750
        source.lock_read()
751
751
        try:
752
752
            old_revision_history = self.branch.revision_history()
753
 
            count = self.branch.pull(source, overwrite)
 
753
            count = self.branch.pull(source, overwrite,stop_revision)
754
754
            new_revision_history = self.branch.revision_history()
755
755
            if new_revision_history != old_revision_history:
756
756
                if len(old_revision_history):