Rev 3191: Adjust format metadata (dato) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3191
revision-id:pqm at pqm.ubuntu.com-20080117151706-6jqnhytwgt1xfttw
parent: pqm at pqm.ubuntu.com-20080117061714-b11thhb6x5jbgwpl
parent: aaron at aaronbentley.com-20080117134516-ygkh2063h1vypgvf
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-01-17 15:17:06 +0000
message:
  Adjust format metadata (dato)
modified:
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
    ------------------------------------------------------------
    revno: 3190.1.2
    revision-id:aaron at aaronbentley.com-20080117134516-ygkh2063h1vypgvf
    parent: aaron at aaronbentley.com-20080117134157-ae8t7iy0ubl2x3m1
    committer: Aaron Bentley <aaron at aaronbentley.com>
    branch nick: bzr.ab.integration
    timestamp: Thu 2008-01-17 08:45:16 -0500
    message:
      Undo spurious change
    modified:
      bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
    ------------------------------------------------------------
    revno: 3190.1.1
    revision-id:aaron at aaronbentley.com-20080117134157-ae8t7iy0ubl2x3m1
    parent: pqm at pqm.ubuntu.com-20080117061714-b11thhb6x5jbgwpl
    parent: dato at net.com.org.es-20080114092822-0tlte51nh91xlw20
    committer: Aaron Bentley <aaron at aaronbentley.com>
    branch nick: bzr.ab.integration
    timestamp: Thu 2008-01-17 08:41:57 -0500
    message:
      Merge from format fixes from dato
    modified:
      bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
    ------------------------------------------------------------
    revno: 3170.4.4
    revision-id:dato at net.com.org.es-20080114092822-0tlte51nh91xlw20
    parent: dato at net.com.org.es-20080113093843-uwcb0h9d88g85elu
    committer: Adeodato Simó <dato at net.com.org.es>
    branch nick: bzr.pack_no_experimental
    timestamp: Mon 2008-01-14 10:28:22 +0100
    message:
      Keep the hidden flag for subtree formats after review from Aaron.
    modified:
      bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
    ------------------------------------------------------------
    revno: 3170.4.3
    revision-id:dato at net.com.org.es-20080113093843-uwcb0h9d88g85elu
    parent: dato at net.com.org.es-20080109102901-bbwav49dueo88mub
    committer: Adeodato Simó <dato at net.com.org.es>
    branch nick: bzr.pack_no_experimental
    timestamp: Sun 2008-01-13 10:38:43 +0100
    message:
      Mark the subtree formats as experimental instead of hidden, and remove hidden=True from the rich-root ones.
    modified:
      bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
    ------------------------------------------------------------
    revno: 3170.4.2
    revision-id:dato at net.com.org.es-20080109102901-bbwav49dueo88mub
    parent: dato at net.com.org.es-20080109102120-7rijcaxihhyc2p2w
    committer: Adeodato Simó <dato at net.com.org.es>
    branch nick: bzr.pack_no_experimental
    timestamp: Wed 2008-01-09 11:29:01 +0100
    message:
      Remove the experimental flag of rich-root-pack and pack-0.92-subtree as well.
    modified:
      bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
    ------------------------------------------------------------
    revno: 3170.4.1
    revision-id:dato at net.com.org.es-20080109102120-7rijcaxihhyc2p2w
    parent: pqm at pqm.ubuntu.com-20080107174938-hvwo399dzshh3cod
    author: Goffredo Baroncelli <kreijack at tiscalinet.it>
    committer: Adeodato Simó <dato at net.com.org.es>
    branch nick: bzr.pack_no_experimental
    timestamp: Wed 2008-01-09 11:21:20 +0100
    message:
      Remove the experimental flag from the format 'pack-0.92'.
    modified:
      bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py	2008-01-09 00:51:01 +0000
+++ b/bzrlib/bzrdir.py	2008-01-17 13:45:16 +0000
@@ -2626,7 +2626,6 @@
         ' bzr < 1.0',
     branch_format='bzrlib.branch.BzrBranchFormat6',
     tree_format='bzrlib.workingtree.WorkingTreeFormat4',
-    hidden=False,
     )
 format_registry.register_metadir('dirstate-with-subtree',
     'bzrlib.repofmt.knitrepo.RepositoryFormatKnit3',
@@ -2635,6 +2634,7 @@
         'bzr branches. Incompatible with bzr < 0.15.',
     branch_format='bzrlib.branch.BzrBranchFormat6',
     tree_format='bzrlib.workingtree.WorkingTreeFormat4',
+    experimental=True,
     hidden=True,
     )
 format_registry.register_metadir('pack-0.92',
@@ -2647,7 +2647,6 @@
         'http://doc.bazaar-vcs.org/latest/developers/packrepo.html.',
     branch_format='bzrlib.branch.BzrBranchFormat6',
     tree_format='bzrlib.workingtree.WorkingTreeFormat4',
-    experimental=True,
     )
 format_registry.register_metadir('pack-0.92-subtree',
     'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack3',
@@ -2669,7 +2668,5 @@
         ' bzr < 1.0',
     branch_format='bzrlib.branch.BzrBranchFormat6',
     tree_format='bzrlib.workingtree.WorkingTreeFormat4',
-    hidden=False,
-    experimental=True,
     )
 format_registry.set_default('pack-0.92')