~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: Martin Pool
  • Date: 2009-08-15 08:07:50 UTC
  • mto: This revision was merged to the branch mainline in revision 4614.
  • Revision ID: mbp@sourcefrog.net-20090815080750-kw8fh8trba5euzoh
Change overly-tight selftest test to use a re

Show diffs side-by-side

added added

removed removed

Lines of Context:
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)
161
159
        finally:
162
160
            old.unlock()
163
161
            new.unlock()
 
162
            if nonexistents:
 
163
              raise errors.PathsDoNotExist(nonexistents)
164
164
    finally:
165
165
        wt.unlock()
166
166