← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

Merge orphan-non-versioned-files into deprecate-get-backup-name

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
1311
1311
        empty = repository.revision_tree(_mod_revision.NULL_REVISION)
1312
1312
        # We ignore the conflicts returned by wt.revert since we're about to
1313
1313
        # delete the wt metadata anyway, all that should be left here are
1314
 
        # detritus. But see bug #634470.
 
1314
        # detritus. But see bug #634470 about subtree .bzr dirs.
1315
1315
        conflicts = wt.revert(old_tree=empty)
1316
1316
        self.destroy_workingtree_metadata()
1317
1317