← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

merge 2.0 branch rev 4647

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
156
156
                to_file.write("%s %s\n" % (prefix, nonexistent))
157
157
            if (new_is_working_tree and show_pending):
158
158
                show_pending_merges(new, to_file, short, verbose=verbose)
 
159
            if nonexistents:
 
160
                raise errors.PathsDoNotExist(nonexistents)
159
161
        finally:
160
162
            old.unlock()
161
163
            new.unlock()
162
 
            if nonexistents:
163
 
              raise errors.PathsDoNotExist(nonexistents)
164
164
    finally:
165
165
        wt.unlock()
166
166