← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-04-28 13:13:49 UTC
  • mfrom: (5810.1.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20110428131349-dt632s6r8p3qewxb
(vila) Merge 2.3 into trunk resolving conflicts (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
3999
3999
            merger.other_rev_id is not None):
4000
4000
            note('Nothing to do.')
4001
4001
            return 0
4002
 
        if pull:
 
4002
        if pull and not preview:
4003
4003
            if merger.interesting_files is not None:
4004
4004
                raise errors.BzrCommandError('Cannot pull individual files')
4005
4005
            if (merger.base_rev_id == tree.last_revision()):