~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/delta.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-04-20 02:51:29 UTC
  • mfrom: (1662.1.16 bzr.mbp.integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060420025129-8e219a634d2d4dbc
(mbp) #36963, #3619, #39657, other cleanups

Show diffs side-by-side

added added

removed removed

Lines of Context:
160
160
        files within them.  Any unversioned files given have no effect
161
161
        (but this might change in the future).
162
162
    """
163
 
 
 
163
    # NB: show_status depends on being able to pass in non-versioned files and
 
164
    # report them as unknown
164
165
    old_tree.lock_read()
165
166
    try:
166
167
        new_tree.lock_read()