Rev 5421: Merge orphan-non-versioned-files into deprecate-get-backup-name in file:///home/vila/src/bzr/bugs/323111-orphans/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/323111-orphans/

------------------------------------------------------------
revno: 5421 [merge]
revision-id: v.ladeuil+lp at free.fr-20100910143713-rwf44dzwpz1jinyh
parent: v.ladeuil+lp at free.fr-20100910143320-4vefjhqx03pxbkm3
parent: v.ladeuil+lp at free.fr-20100910143650-5cupus4yoorb8xw5
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: deprecate-get-backup-name
timestamp: Fri 2010-09-10 16:37:13 +0200
message:
  Merge orphan-non-versioned-files into deprecate-get-backup-name
modified:
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
-------------- next part --------------
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py	2010-09-10 08:23:31 +0000
+++ b/bzrlib/bzrdir.py	2010-09-10 14:36:50 +0000
@@ -1311,7 +1311,7 @@
         empty = repository.revision_tree(_mod_revision.NULL_REVISION)
         # We ignore the conflicts returned by wt.revert since we're about to
         # delete the wt metadata anyway, all that should be left here are
-        # detritus. But see bug #634470.
+        # detritus. But see bug #634470 about subtree .bzr dirs.
         conflicts = wt.revert(old_tree=empty)
         self.destroy_workingtree_metadata()