Rev 4491: Start addressing jam's concerns. in file:///home/vila/src/bzr/bugs/284038-push-strict/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Tue Jun 30 09:06:35 BST 2009
At file:///home/vila/src/bzr/bugs/284038-push-strict/
------------------------------------------------------------
revno: 4491
revision-id: v.ladeuil+lp at free.fr-20090630080635-w9gmlrpta383usl1
parent: v.ladeuil+lp at free.fr-20090629090228-ie3jj7l61r9ljl9f
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 284038-push-strict
timestamp: Tue 2009-06-30 10:06:35 +0200
message:
Start addressing jam's concerns.
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS 2009-06-29 09:02:28 +0000
+++ b/NEWS 2009-06-30 08:06:35 +0000
@@ -23,8 +23,8 @@
* ``bzr push`` now aborts if uncommitted changes (including pending merges)
are present in the working tree (if one is present) and no revision is
- speficied. The ``push_strict`` option can be declared in a configuration
- file. option is used. (Vincent Ladeuil, #284038, #322808, #65286)
+ speified. The configuration option ``push_strict`` can be used to set the
+ default for this behavior. (Vincent Ladeuil, #284038, #322808, #65286)
Bug Fixes
=== modified file 'bzrlib/errors.py'
--- a/bzrlib/errors.py 2009-06-19 00:33:36 +0000
+++ b/bzrlib/errors.py 2009-06-30 08:06:35 +0000
@@ -2778,7 +2778,8 @@
class UncommittedChanges(BzrError):
- _fmt = 'Working tree "%(display_url)s" has uncommitted changes.'
+ _fmt = ('Working tree "%(display_url)s" has uncommitted changes'
+ ' (See bzr status).')
def __init__(self, tree):
import bzrlib.urlutils as urlutils
More information about the bazaar-commits
mailing list