← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/branch.py

  • Committer: Patch Queue Manager
  • Date: 2012-09-05 20:52:26 UTC
  • mfrom: (6549.3.1 dev_2.5_integration)
  • Revision ID: pqm@pqm.ubuntu.com-20120905205226-8s3bzolvduug3ifj
(gz) Merge 2.5 (Martin Packman)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/branch.py
299
299
 
300
300
    def do_tip_change_with_locked_branch(self, branch, new_last_revision_id):
301
301
        if new_last_revision_id == 'null:':
302
 
            branch._set_revision_history([])
 
302
            branch.set_last_revision_info(0, new_last_revision_id)
303
303
        else:
304
304
            if not branch.repository.has_revision(new_last_revision_id):
305
305
                return FailedSmartServerResponse(
306
306
                    ('NoSuchRevision', new_last_revision_id))
307
 
            branch._set_revision_history(branch._lefthand_history(
308
 
                new_last_revision_id, None, None))
 
307
            branch.generate_revision_history(new_last_revision_id, None, None)
309
308
        return SuccessfulSmartServerResponse(('ok',))
310
309
 
311
310