← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-09-06 12:20:16 UTC
  • mfrom: (1551.8.23 Aaron's mergeable stuff)
  • Revision ID: pqm@pqm.ubuntu.com-20060906122016-54ab3159023ef544
Improve conflict message for deleting directories with contents

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1326
1326
            trans_id = conflict[1]
1327
1327
            try:
1328
1328
                tt.cancel_deletion(trans_id)
1329
 
                new_conflicts.add((c_type, 'Not deleting', trans_id))
 
1329
                new_conflicts.add(('deleting parent', 'Not deleting', 
 
1330
                                   trans_id))
1330
1331
            except KeyError:
1331
1332
                tt.create_directory(trans_id)
1332
 
                new_conflicts.add((c_type, 'Created directory.', trans_id))
 
1333
                new_conflicts.add((c_type, 'Created directory', trans_id))
1333
1334
        elif c_type == 'unversioned parent':
1334
1335
            tt.version_file(tt.inactive_file_id(conflict[1]), conflict[1])
1335
1336
            new_conflicts.add((c_type, 'Versioned directory', conflict[1]))