← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/foreign.py

  • Committer: Jelmer Vernooij
  • Date: 2011-05-14 07:56:12 UTC
  • mto: (5853.2.8 lossy-argument)
  • mto: This revision was merged to the branch mainline in revision 5877.
  • Revision ID: jelmer@samba.org-20110514075612-d53tdgrx926q24mc
Make lossy_push an argument to InterBranch.push.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/foreign.py
20
20
 
21
21
from bzrlib.branch import (
22
22
    Branch,
23
 
    InterBranch,
24
23
    )
25
24
from bzrlib.commands import Command, Option
26
25
from bzrlib.repository import Repository
315
314
        target_branch.lock_write()
316
315
        try:
317
316
            try:
318
 
                push_result = source_branch.lossy_push(target_branch)
 
317
                push_result = source_branch.push(target_branch, lossy=True)
319
318
            except errors.LossyPushToSameVCS:
320
319
                raise BzrCommandError("%r and %r are in the same VCS, lossy "
321
320
                    "push not necessary. Please use regular push." %