/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: John Arbash Meinel
  • Date: 2009-08-04 14:10:09 UTC
  • mfrom: (4585 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4588.
  • Revision ID: john@arbash-meinel.com-20090804141009-uety2n17v1atk5ok
Merge bzr.dev 4585, resolve NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
77
77
from bzrlib.trace import (
78
78
    mutter,
79
79
    note,
 
80
    warning,
80
81
    )
81
82
 
82
83
from bzrlib import (
1233
1234
        return result
1234
1235
 
1235
1236
    def push_branch(self, source, revision_id=None, overwrite=False, 
1236
 
        remember=False):
 
1237
        remember=False, create_prefix=False):
1237
1238
        """Push the source branch into this BzrDir."""
1238
1239
        br_to = None
1239
1240
        # If we can open a branch, use its direct repository, otherwise see
1384
1385
        # that can do wonky stuff here, and that only
1385
1386
        # happens for creating checkouts, which cannot be
1386
1387
        # done on this format anyway. So - acceptable wart.
 
1388
        if hardlink:
 
1389
            warning("can't support hardlinked working trees in %r"
 
1390
                % (self,))
1387
1391
        try:
1388
1392
            result = self.open_workingtree(recommend_upgrade=False)
1389
1393
        except errors.NoSuchFile: