← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Aaron Bentley
  • Date: 2009-06-26 03:44:30 UTC
  • mfrom: (4481 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4482.
  • Revision ID: aaron@aaronbentley.com-20090626034430-5btbqa44ikywccsu
Merge bzr.dev into vpipe

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1044
1044
        if directory is None:
1045
1045
            directory = '.'
1046
1046
        # Get the source branch
1047
 
        tree, br_from = bzrdir.BzrDir.open_tree_or_branch(directory)
 
1047
        (tree, br_from,
 
1048
         _unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1048
1049
        if strict is None:
1049
1050
            strict = br_from.get_config().get_user_option('push_strict')
1050
1051
            if strict is not None: