~bzr-pqm/bzr/bzr.dev

Committer: Robert Collins
Date: 2006-02-13 23:19:29 UTC
mfrom: (1185.50.74 bzr-jam-integration)
mto: (1534.11.2 test-pb) (1185.50.76 bzr-jam-integration) (1559.1.1 integration) (1556.1.2 versioned-file-new-repo-format) (1704.1.1 integration)
mto: This revision was merged to the branch mainline in revision 1554.
Revision ID: robertc@robertcollins.net-20060213231929-686f2e0d9859cd83

Merge from jam-integration.

added added

removed removed

745

yield stem

746

747

@needs_write_lock

748

def pull(self, source, overwrite=False):

748

def pull(self, source, overwrite=False, stop_revision=None):

749

from bzrlib.merge import merge_inner

750

source.lock_read()

751

try:

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

new_revision_history = self.branch.revision_history()

755

if new_revision_history != old_revision_history:

756

if len(old_revision_history):