← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Martin Pool
  • Date: 2006-04-13 05:51:35 UTC
  • mto: This revision was merged to the branch mainline in revision 1662.
  • Revision ID: mbp@sourcefrog.net-20060413055135-1a40ec5436f0dbd0
diff on unversiond files should give an error (Malone #3619)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
313
313
 
314
314
def _raise_if_doubly_unversioned(specific_files, old_tree, new_tree):
315
315
    """Complain if paths are not versioned in either tree."""
 
316
    if not specific_files:
 
317
        return
316
318
    old_unversioned = old_tree.filter_unversioned_files(specific_files)
317
319
    new_unversioned = new_tree.filter_unversioned_files(specific_files)
318
320
    unversioned = old_unversioned.intersection(new_unversioned)