← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.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/workingtree.py
1264
1264
        when their last revision is set.
1265
1265
        """
1266
1266
        if _mod_revision.is_null(new_revision):
1267
 
            self.branch.set_revision_history([])
 
1267
            self.branch.set_last_revision_info(0, new_revision)
1268
1268
            return False
1269
1269
        try:
1270
1270
            self.branch.generate_revision_history(new_revision)
1271
1271
        except errors.NoSuchRevision:
1272
1272
            # not present in the repo - dont try to set it deeper than the tip
1273
 
            self.branch.set_revision_history([new_revision])
 
1273
            self.branch._set_revision_history([new_revision])
1274
1274
        return True
1275
1275
 
1276
1276
    @needs_tree_write_lock