[MERGE] init-repo help tweaks

[Matthew D. Fuller]

Attached adds a missing space and fixes an unnecessarily involved
sentence in the init-repo help.  These should be fairly
non-controversial.


Beyond that, I think a little more adjustment in the text might be
called for.  As a first step, describing a little more what's "shared"
about the shared repo wouldn't hurt.  Perhaps something like:

=== modified file 'bzrlib/builtins.py'
--- bzrlib/builtins.py	2007-03-21 04:39:51 +0000
+++ bzrlib/builtins.py	2007-03-21 04:57:33 +0000
@@ -1287,7 +1287,8 @@
     """Create a shared repository to hold branches.
 
     New branches created under the repository directory will store their revisions
-    in the repository, not in the branch directory.
+    in the repository, not in the branch directory.  Branches in the repository
+    will share any common history, rather than storing multiple individual copies.
 
     example:
         bzr init-repo --no-trees repo



As well, while I've taken out the phrase about formats, a slightly
different version of the issue seems likely to come up soon.  To wit:
To be shared, the branch format doesn't merely need to be a sharable
format; it needs to be the SAME sharable [repo-]format as the
repository.  Aside from metaweave, which was never a default format
(and so can probably be safely ignored), we haven't had a non-testing
repo format, but it's hanging right there on the horizon now.  Should
we (and/or can we, concisely enough) broach that topic in the help, or
just do our best to describe it in other documentation?


-- 
Matthew Fuller     (MF4839)   |  fullermd at over-yonder.net
Systems/Network Administrator |  http://www.over-yonder.net/~fullermd/
           On the Internet, nobody can hear you scream.
-------------- next part --------------
# Bazaar revision bundle v0.8
#
# message:
#   Shared-capable formats are standard, and have been for a good long
#   while, so don't make a big deal of it in the help summary for
#   init-repo.
#   
# committer: Matthew Fuller <fullermd at over-yonder.net>
# date: Tue 2007-03-20 23:39:51.492000103 -0500

=== modified file bzrlib/builtins.py
--- bzrlib/builtins.py
+++ bzrlib/builtins.py
@@ -1287,8 +1287,7 @@
     """Create a shared repository to hold branches.
 
     New branches created under the repository directory will store their revisions
-    in the repository, not in the branch directory, if the branch format supports
-    shared storage.
+    in the repository, not in the branch directory.
 
     example:
         bzr init-repo --no-trees repo
@@ -1307,7 +1306,7 @@
                             value_switches=True, title='Repository format'),
                      Option('no-trees',
                              help='Branches in the repository will default to'
-                                  'not having a working tree'),
+                                  ' not having a working tree'),
                     ]
     aliases = ["init-repo"]
 

=== modified directory  // last-changed:fullermd at over-yonder.net-20070321043951
... -0i5v9kc7tosonk9g
# revision id: fullermd at over-yonder.net-20070321043951-0i5v9kc7tosonk9g
# sha1: cface550879e26668be791963126e48cc883855e
# inventory sha1: 0c9ac64afb8a97395f36a2c49cb28de62074a9b0
# parent ids:
#   fullermd at over-yonder.net-20070321040149-1c8b4mwco7llas7z
# base id: pqm at pqm.ubuntu.com-20070320222307-30c846e90ac18c65
# properties:
#   branch-nick: init-repo-help

# message:
#   Missing space in --no-trees help.
#   
# committer: Matthew Fuller <fullermd at over-yonder.net>
# date: Tue 2007-03-20 23:01:49.078999996 -0500

=== modified file bzrlib/builtins.py // encoding:base64
LS0tIGJ6cmxpYi9idWlsdGlucy5weQorKysgYnpybGliL2J1aWx0aW5zLnB5CkBAIC0xMzA3LDcg
KzEzMDcsNyBAQAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHZhbHVlX3N3aXRjaGVzPVRy
dWUsIHRpdGxlPSdSZXBvc2l0b3J5IGZvcm1hdCcpLAogICAgICAgICAgICAgICAgICAgICAgT3B0
aW9uKCduby10cmVlcycsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGhlbHA9J0JyYW5j
aGVzIGluIHRoZSByZXBvc2l0b3J5IHdpbGwgZGVmYXVsdCB0bycKLSAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAnbm90IGhhdmluZyBhIHdvcmtpbmcgdHJlZScpLAorICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICcgbm90IGhhdmluZyBhIHdvcmtpbmcgdHJlZScpLAog
ICAgICAgICAgICAgICAgICAgICBdCiAgICAgYWxpYXNlcyA9IFsiaW5pdC1yZXBvIl0KIAoK

=== modified directory  // last-changed:fullermd at over-yonder.net-20070321040149
... -1c8b4mwco7llas7z
# revision id: fullermd at over-yonder.net-20070321040149-1c8b4mwco7llas7z
# sha1: 16cfa2c2a583aefd77fc152bc1c1234227c6dd7f
# inventory sha1: 9c8d2140ff0eccf845b1ecc986d8981cbf484a41
# parent ids:
#   pqm at pqm.ubuntu.com-20070320222307-30c846e90ac18c65
# properties:
#   branch-nick: init-repo-help