← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

Merged John Meinel's integration

Show diffs side-by-side

added added

removed removed

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