← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Robert Collins
  • Date: 2006-03-05 00:19:31 UTC
  • mto: This revision was merged to the branch mainline in revision 1590.
  • Revision ID: robertc@robertcollins.net-20060305001931-051a5898ad439113
update updates working tree and branch together.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1161
1161
 
1162
1162
    @needs_write_lock
1163
1163
    def update(self):
 
1164
        old_tip = self.branch.update()
1164
1165
        self.branch.lock_read()
1165
1166
        try:
1166
1167
            if self.last_revision() == self.branch.last_revision():
 
1168
                # no change
1167
1169
                return
1168
1170
            basis = self.basis_tree()
1169
1171
            to_tree = self.branch.basis_tree()