Rev 5766: Merge Federico Culloca's PointlessCommit message, and revert accidental changes. in http://bazaar.launchpad.net/~jameinel/bzr/integration

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/integration

------------------------------------------------------------
revno: 5766 [merge]
revision-id: john at arbash-meinel.com-20110407112309-gbv1rjk2ywohtu05
parent: pqm at pqm.ubuntu.com-20110407111546-99kqi96vnk9u8qvc
parent: djthrottle at gmail.com-20110406160730-jmw2tofd5dsl2w3k
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: integration
timestamp: Thu 2011-04-07 13:23:09 +0200
message:
  Merge Federico Culloca's PointlessCommit message, and revert accidental changes.
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
-------------- next part --------------
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2011-04-01 08:00:04 +0000
+++ b/bzrlib/builtins.py	2011-04-07 11:23:09 +0000
@@ -3273,7 +3273,10 @@
                         exclude=tree.safe_relpath_files(exclude))
         except PointlessCommit:
             raise errors.BzrCommandError("No changes to commit."
-                              " Use --unchanged to commit anyhow.")
+                                         "Please 'bzr add' the files "
+                                         "you want to commit, or use "
+                                         "--unchanged to force "
+                                         "an empty commit.")
         except ConflictsInTree:
             raise errors.BzrCommandError('Conflicts detected in working '
                 'tree.  Use "bzr conflicts" to list, "bzr resolve FILE" to'