← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/foreign.py

  • Committer: Aaron Bentley
  • Date: 2009-05-28 07:56:59 UTC
  • mfrom: (4384 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4386.
  • Revision ID: aaron@aaronbentley.com-20090528075659-bb835aj2sr711emf
Merge bzr.dev into commit-preview.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/foreign.py
329
329
        target_branch.lock_write()
330
330
        try:
331
331
            try:
332
 
                revid_map = source_branch.lossy_push(target_branch)
 
332
                push_result = source_branch.lossy_push(target_branch)
333
333
            except errors.LossyPushToSameVCS:
334
334
                raise BzrCommandError("%r and %r are in the same VCS, lossy "
335
335
                    "push not necessary. Please use regular push." %
349
349
                        update_workingtree_fileids(source_wt, target)
350
350
                    finally:
351
351
                        source_wt.unlock()
 
352
            push_result.report(self.outf)
352
353
        finally:
353
354
            target_branch.unlock()
354
355
 
365
366
 
366
367
        :param target: Target branch
367
368
        :param stop_revision: Revision to push, defaults to last revision.
368
 
        :return: Dictionary mapping revision ids from the target branch 
 
369
        :return: BranchPushResult with an extra member revidmap: 
 
370
            A dictionary mapping revision ids from the target branch 
369
371
            to new revision ids in the target branch, for each 
370
372
            revision that was pushed.
371
373
        """