← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Mark Hammond
  • Date: 2008-08-24 07:21:49 UTC
  • mto: (4916.1.1 45719-update-r)
  • mto: This revision was merged to the branch mainline in revision 4923.
  • Revision ID: mhammond@skippinet.com.au-20080824072149-tlfpyjlkqpwen8yb
more tweaks of the merge to get the tests passing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
2124
2124
        """
2125
2125
        if self.branch.get_bound_location() is not None:
2126
2126
            self.lock_write()
2127
 
            update_branch = (old_tip == self._marker)
 
2127
            update_branch = (old_tip is self._marker)
2128
2128
        else:
2129
2129
            self.lock_tree_write()
2130
2130
            update_branch = False
2132
2132
            if update_branch:
2133
2133
                old_tip = self.branch.update(possible_transports)
2134
2134
            else:
2135
 
                old_tip = None
 
2135
                if old_tip is self._marker:
 
2136
                    old_tip = None
2136
2137
            return self._update_tree(old_tip, change_reporter, revision)
2137
2138
        finally:
2138
2139
            self.unlock()