← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/branch.py

  • Committer: Ross Lagerwall
  • Date: 2012-08-07 06:32:51 UTC
  • mto: (6437.63.5 2.5)
  • mto: This revision was merged to the branch mainline in revision 6558.
  • Revision ID: rosslagerwall@gmail.com-20120807063251-x9p03ghg2ws8oqjc
Add bzrlib/locale to .bzrignore

bzrlib/locale is generated with ./setup.py build_mo which is in turn called
by ./setup.py build

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_last_revision_info(0, new_last_revision_id)
 
302
            branch._set_revision_history([])
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.generate_revision_history(new_last_revision_id, None, None)
 
307
            branch._set_revision_history(branch._lefthand_history(
 
308
                new_last_revision_id, None, None))
308
309
        return SuccessfulSmartServerResponse(('ok',))
309
310
 
310
311