← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

[patch] show number of revisions pushed/pulled/merged (Robey Pointer)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
383
383
        source.lock_read()
384
384
        try:
385
385
            old_revision_history = self.branch.revision_history()
386
 
            self.branch.pull(source, overwrite)
 
386
            count = self.branch.pull(source, overwrite)
387
387
            new_revision_history = self.branch.revision_history()
388
388
            if new_revision_history != old_revision_history:
389
389
                if len(old_revision_history):
393
393
                merge_inner(self.branch,
394
394
                            self.branch.basis_tree(), 
395
395
                            self.branch.revision_tree(other_revision))
 
396
            return count
396
397
        finally:
397
398
            source.unlock()
398
399