Rev 3261: update .bzr/README to not refer to Bazaar-NG, and add link to website. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 3261
revision-id:pqm at pqm.ubuntu.com-20080310220259-preiorp3r2pj9er9
parent: pqm at pqm.ubuntu.com-20080310202441-q09492ma24sdzp51
parent: amanic at gmail.com-20080309221624-hgkclbizlcna9y09
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-03-10 22:02:59 +0000
message:
  update .bzr/README to not refer to Bazaar-NG, and add link to website.
modified:
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/tests/test_upgrade.py   test_upgrade.py-20051004040251-555fe1d2bae1bc71
    ------------------------------------------------------------
    revno: 3250.2.1
    revision-id:amanic at gmail.com-20080309221624-hgkclbizlcna9y09
    parent: pqm at pqm.ubuntu.com-20080304113936-4wrordr8lrxhvfdl
    committer: Marius Kruger <amanic at gmail.com>
    branch nick: bzr.rm_error_to_note
    timestamp: Mon 2008-03-10 00:16:24 +0200
    message:
      update .bzr/README to not refer to Bazaar-NG, and add link to website.
    modified:
      bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
      bzrlib/tests/test_upgrade.py   test_upgrade.py-20051004040251-555fe1d2bae1bc71
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py	2008-02-24 16:42:13 +0000
+++ b/bzrlib/bzrdir.py	2008-03-09 22:16:24 +0000
@@ -1491,8 +1491,9 @@
         mutter('created control directory in ' + transport.base)
         control = transport.clone('.bzr')
         utf8_files = [('README', 
-                       "This is a Bazaar-NG control directory.\n"
-                       "Do not change any files in this directory.\n"),
+                       "This is a Bazaar control directory.\n"
+                       "Do not change any files in this directory.\n"
+                       "See http://bazaar-vcs.org/ for more information about Bazaar.\n"),
                       ('branch-format', self.get_format_string()),
                       ]
         # NB: no need to escape relative paths that are url safe.

=== modified file 'bzrlib/tests/test_upgrade.py'
--- a/bzrlib/tests/test_upgrade.py	2007-11-26 21:15:26 +0000
+++ b/bzrlib/tests/test_upgrade.py	2008-03-09 22:16:24 +0000
@@ -258,7 +258,9 @@
      ('foo', 'new contents\n'),
      ('.bzr/',),
      ('.bzr/README',
-      'This is a Bazaar-NG control directory.\nDo not change any files in this directory.\n'),
+      'This is a Bazaar control directory.\n'
+      'Do not change any files in this directory.\n'
+      'See http://bazaar-vcs.org/ for more information about Bazaar.\n'),
      ('.bzr/branch-format', 'Bazaar-NG branch, format 0.0.4\n'),
      ('.bzr/revision-history',
       'mbp at sourcefrog.net-20051004035611-176b16534b086b3c\n'
@@ -298,8 +300,9 @@
     ),
     ( './.bzr/', ),
     ( './.bzr/README',
-        'This is a Bazaar-NG control directory.\n'
-        'Do not change any files in this directory.\n'
+      'This is a Bazaar control directory.\n'
+      'Do not change any files in this directory.\n'
+      'See http://bazaar-vcs.org/ for more information about Bazaar.\n'
     ),
     ( './.bzr/branch-format',
         'Bazaar-NG branch, format 0.0.4\n'
@@ -363,8 +366,9 @@
 _upgrade_dir_template = [
     ( './.bzr/', ),
     ( './.bzr/README',
-        'This is a Bazaar-NG control directory.\n'
-        'Do not change any files in this directory.\n'
+      'This is a Bazaar control directory.\n'
+      'Do not change any files in this directory.\n'
+      'See http://bazaar-vcs.org/ for more information about Bazaar.\n'
     ),
     ( './.bzr/branch-format',
         'Bazaar-NG branch, format 0.0.4\n'