← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: aaron.bentley at utoronto
  • Date: 2005-08-05 02:54:23 UTC
  • mto: (1092.1.41) (1185.3.4) (974.1.47)
  • mto: This revision was merged to the branch mainline in revision 1110.
  • Revision ID: aaron.bentley@utoronto.ca-20050805025423-c0434f52aa596d3e
Avoid rewriting inventory when not necessary

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
285
285
                assert path.startswith('./')
286
286
            path = path[2:]
287
287
        adjust_ids.append((path, id))
288
 
    this_branch.set_inventory(regen_inventory(this_branch, this_tree.root, adjust_ids))
 
288
    if len(adjust_ids) > 0:
 
289
        this_branch.set_inventory(regen_inventory(this_branch, this_tree.root,
 
290
                                                  adjust_ids))
289
291
 
290
292
 
291
293
def regen_inventory(this_branch, root, new_entries):