Rev 3563: Make reconfigure --help more verbose (Marius Kruger) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 3563
revision-id:pqm at pqm.ubuntu.com-20080718023009-jiarqexacdzesjvx
parent: pqm at pqm.ubuntu.com-20080718005210-ysk1505wgphsumzj
parent: ian.clatworthy at canonical.com-20080718015854-wa3ekofsqh1o2rv2
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-07-18 03:30:09 +0100
message:
  Make reconfigure --help more verbose (Marius Kruger)
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
    ------------------------------------------------------------
    revno: 3562.1.1
    revision-id:ian.clatworthy at canonical.com-20080718015854-wa3ekofsqh1o2rv2
    parent: pqm at pqm.ubuntu.com-20080718005210-ysk1505wgphsumzj
    parent: amanic at gmail.com-20080713072940-svhghub1njer85m9
    committer: Ian Clatworthy <ian.clatworthy at canonical.com>
    branch nick: ianc-integration
    timestamp: Fri 2008-07-18 11:58:54 +1000
    message:
      Make reconfigure --help more verbose (Marius Kruger)
    modified:
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
    ------------------------------------------------------------
    revno: 3535.4.2
    revision-id:amanic at gmail.com-20080713072940-svhghub1njer85m9
    parent: amanic at gmail.com-20080713072318-vwnr9hc3n3by4x27
    committer: Marius Kruger <amanic at gmail.com>
    branch nick: bzr.command_help
    timestamp: Sun 2008-07-13 09:29:40 +0200
    message:
      Update branches help topic to avoid ambiguity.
      Otherwise people might think we are going to create a 
      directory in a versioned branch.
    modified:
      bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
    ------------------------------------------------------------
    revno: 3535.4.1
    revision-id:amanic at gmail.com-20080713072318-vwnr9hc3n3by4x27
    parent: pqm at pqm.ubuntu.com-20080709135859-wq3r1d1fjcafelgw
    committer: Marius Kruger <amanic at gmail.com>
    branch nick: bzr.command_help
    timestamp: Sun 2008-07-13 09:23:18 +0200
    message:
      Update reconfigure help to say exactly what it wil do.
    modified:
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2008-07-17 05:51:29 +0000
+++ b/bzrlib/builtins.py	2008-07-18 01:58:54 +0000
@@ -4380,17 +4380,22 @@
     If none of these is available, --bind-to must be specified.
     """
 
+    _see_also = ['branches', 'checkouts', 'standalone-trees', 'working-trees']
     takes_args = ['location?']
     takes_options = [RegistryOption.from_kwargs('target_type',
                      title='Target type',
                      help='The type to reconfigure the directory to.',
                      value_switches=True, enum_switch=False,
-                     branch='Reconfigure to a branch.',
-                     tree='Reconfigure to a tree.',
-                     checkout='Reconfigure to a checkout.',
-                     lightweight_checkout='Reconfigure to a lightweight'
-                     ' checkout.',
-                     standalone='Reconfigure to be standalone.',
+                     branch='Reconfigure to be an unbound branch '
+                        'with no working tree.',
+                     tree='Reconfigure to be an unbound branch '
+                        'with a working tree.',
+                     checkout='Reconfigure to be a bound branch '
+                        'with a working tree.',
+                     lightweight_checkout='Reconfigure to be a lightweight'
+                     ' checkout (with no local history).',
+                     standalone='Reconfigure to be a standalone branch '
+                        '(i.e. stop using shared repository).',
                      use_shared='Reconfigure to use a shared repository.'),
                      Option('bind-to', help='Branch to bind checkout to.',
                             type=str),

=== modified file 'bzrlib/help_topics/__init__.py'
--- a/bzrlib/help_topics/__init__.py	2008-06-25 07:17:14 +0000
+++ b/bzrlib/help_topics/__init__.py	2008-07-13 07:29:40 +0000
@@ -480,7 +480,7 @@
 
 Related commands::
 
-  init    Make a directory into a versioned branch.
+  init    Change a directory into a versioned branch.
   branch  Create a new copy of a branch.
   merge   Perform a three-way merge.
 """