← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/foreign.py

  • Committer: Martin Pool
  • Date: 2010-04-21 10:13:50 UTC
  • mto: This revision was merged to the branch mainline in revision 5189.
  • Revision ID: mbp@canonical.com-20100421101350-6eq02ssg8kx1tmb3
Go back to opening branch using url, so it can use all possible transports

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/foreign.py
259
259
 
260
260
 
261
261
class cmd_dpush(Command):
262
 
    __doc__ = """Push into a different VCS without any custom bzr metadata.
 
262
    """Push into a different VCS without any custom bzr metadata.
263
263
 
264
264
    This will afterwards rebase the local branch on the remote
265
265
    branch unless the --no-rebase option is used, in which case 
297
297
            source_branch = Branch.open(directory)
298
298
            source_wt = None
299
299
        if source_wt is not None:
300
 
            source_wt.check_changed_or_out_of_date(
301
 
                strict, 'dpush_strict',
302
 
                more_error='Use --no-strict to force the push.',
303
 
                more_warning='Uncommitted changes will not be pushed.')
 
300
            source_wt.warn_if_changed_or_out_of_date(
 
301
                strict, 'dpush_strict', 'Use --no-strict to force the push.')
304
302
        stored_loc = source_branch.get_push_location()
305
303
        if location is None:
306
304
            if stored_loc is None: