← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/branch.py

  • Committer: John Arbash Meinel
  • Date: 2011-04-22 14:12:22 UTC
  • mfrom: (5809 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5836.
  • Revision ID: john@arbash-meinel.com-20110422141222-nx2j0hbkihcb8j16
Merge newer bzr.dev and resolve conflicts.
Try to write some documentation about how the _dirblock_state works.
Fix up the tests so that they pass again.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/branch.py
232
232
 
233
233
    def do_tip_change_with_locked_branch(self, branch, new_last_revision_id):
234
234
        if new_last_revision_id == 'null:':
235
 
            branch.set_revision_history([])
 
235
            branch._set_revision_history([])
236
236
        else:
237
237
            if not branch.repository.has_revision(new_last_revision_id):
238
238
                return FailedSmartServerResponse(
239
239
                    ('NoSuchRevision', new_last_revision_id))
240
 
            branch.set_revision_history(branch._lefthand_history(
 
240
            branch._set_revision_history(branch._lefthand_history(
241
241
                new_last_revision_id, None, None))
242
242
        return SuccessfulSmartServerResponse(('ok',))
243
243