Rev 2229: Fix error message as suggested by Martin. in http://bzr.arbash-meinel.com/branches/bzr/0.14-working/fix_push_alt

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/0.14-working/fix_push_alt

------------------------------------------------------------
revno: 2229
revision-id: john at arbash-meinel.com-20070207190954-krggmnrtirakr6va
parent: john at arbash-meinel.com-20070109195408-1spuyx876hjat226
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fix_push_alt
timestamp: Wed 2007-02-07 13:09:54 -0600
message:
  Fix error message as suggested by Martin.
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
-------------- next part --------------
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2007-01-09 19:54:08 +0000
+++ b/bzrlib/builtins.py	2007-02-07 19:09:54 +0000
@@ -704,10 +704,9 @@
             # we have a bzrdir but no branch or repository
             # XXX: Figure out what to do other than complain.
             raise errors.BzrCommandError("At %s you have a valid .bzr control"
-                " directory. But we could not find a valid repository or"
-                " branch associated with it. This is an unsupported"
-                " configuration. Please move the target directory out of the"
-                " way and try again."
+                " directory, but not a branch or repository. This is an"
+                " unsupported configuration. Please move the target directory"
+                " out of the way and try again."
                 % location)
         elif br_to is None:
             # We have a repository but no branch, copy the revisions, and then