← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

(gz) Warn rather than erroring if pull --show-base is used without a tree
 (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1184
1184
            tree_to = None
1185
1185
            branch_to = Branch.open_containing(directory)[0]
1186
1186
            self.add_cleanup(branch_to.lock_write().unlock)
1187
 
 
1188
 
        if tree_to is None and show_base:
1189
 
            raise errors.BzrCommandError(gettext("Need working tree for --show-base."))
 
1187
            if show_base:
 
1188
                warning(gettext("No working tree, ignoring --show-base"))
1190
1189
 
1191
1190
        if local and not branch_to.get_bound_location():
1192
1191
            raise errors.LocalRequiresBoundBranch()