/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/branch.py

  • Committer: John Arbash Meinel
  • Date: 2008-06-07 22:15:25 UTC
  • mto: This revision was merged to the branch mainline in revision 3487.
  • Revision ID: john@arbash-meinel.com-20080607221525-jfarlas0hrdt3r9m
https://launchpad.net/bugs/238149
Fix bug #238149, RemoteBranch.pull needs to return the _real_branch's pull result.

The test won't actually test the fix until bug #238227 is closed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
2140
2140
    :ivar old_revid: Tip revision id before pull.
2141
2141
    :ivar new_revid: Tip revision id after pull.
2142
2142
    :ivar source_branch: Source (local) branch object.
2143
 
    :ivar master_branch: Master branch of the target, or None.
 
2143
    :ivar master_branch: Master branch of the target, or the target if no
 
2144
        Master
 
2145
    :ivar local_branch: target branch if there is a Master, else None
2144
2146
    :ivar target_branch: Target/destination branch object.
 
2147
    :ivar tag_conflicts: A list of tag conflicts, see BasicTags.merge_to
2145
2148
    """
2146
2149
 
2147
2150
    def __int__(self):