/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/git/workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2020-06-30 02:53:46 UTC
  • mfrom: (7490.40.40 work)
  • mto: (7490.40.48 work)
  • mto: This revision was merged to the branch mainline in revision 7519.
  • Revision ID: jelmer@jelmer.uk-20200630025346-8ubb2cidum1g2h88
Merge lp:brz/3.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/workingtree.py
1199
1199
                    (index, subpath) = self._lookup_index(entry.path)
1200
1200
                    index[subpath] = index_entry_from_stat(st, entry.sha, 0)
1201
1201
 
1202
 
    def _update_git_tree(self, old_revision, new_revision, change_reporter=None,
1203
 
                         show_base=False):
 
1202
    def _update_git_tree(
 
1203
            self, old_revision, new_revision, change_reporter=None,
 
1204
            show_base=False):
1204
1205
        basis_tree = self.revision_tree(old_revision)
1205
1206
        if new_revision != old_revision:
1206
1207
            with basis_tree.lock_read():