← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2011-04-21 20:32:16 UTC
  • mfrom: (5809.1.2 pwit1)
  • mto: This revision was merged to the branch mainline in revision 5821.
  • Revision ID: jelmer@samba.org-20110421203216-r04j4x5vugrup6u9
Merge per-wt-inventory-tests-pt1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1234
1234
        when their last revision is set.
1235
1235
        """
1236
1236
        if _mod_revision.is_null(new_revision):
1237
 
            self.branch.set_revision_history([])
 
1237
            self.branch.set_last_revision_info(0, new_revision)
1238
1238
            return False
1239
1239
        try:
1240
1240
            self.branch.generate_revision_history(new_revision)
1241
1241
        except errors.NoSuchRevision:
1242
1242
            # not present in the repo - dont try to set it deeper than the tip
1243
 
            self.branch.set_revision_history([new_revision])
 
1243
            self.branch._set_revision_history([new_revision])
1244
1244
        return True
1245
1245
 
1246
1246
    @needs_tree_write_lock