Rev 3672: Put the format in quotes, makes it easier to follow. in http://bzr.arbash-meinel.com/branches/bzr/jam-integration
John Arbash Meinel
john at arbash-meinel.com
Tue Sep 2 22:38:06 BST 2008
At http://bzr.arbash-meinel.com/branches/bzr/jam-integration
------------------------------------------------------------
revno: 3672
revision-id: john at arbash-meinel.com-20080902213804-yt0lemudi03eu4e0
parent: john at arbash-meinel.com-20080902213615-tcm28zy17l131n4u
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2008-09-02 16:38:04 -0500
message:
Put the format in quotes, makes it easier to follow.
-------------- next part --------------
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py 2008-09-02 21:36:15 +0000
+++ b/bzrlib/bzrdir.py 2008-09-02 21:38:04 +0000
@@ -1051,7 +1051,8 @@
else:
bzrdir_format_name = '1.6'
repo_format = pack_repo.RepositoryFormatKnitPack5()
- note('Source format does not support stacking, using format: %s\n %s\n',
+ note('Source format does not support stacking, using format:'
+ ' \'%s\'\n %s\n',
bzrdir_format_name, repo_format.get_format_description())
format.repository_format = repo_format
return format
=== modified file 'bzrlib/tests/blackbox/test_branch.py'
--- a/bzrlib/tests/blackbox/test_branch.py 2008-09-02 21:36:15 +0000
+++ b/bzrlib/tests/blackbox/test_branch.py 2008-09-02 21:38:04 +0000
@@ -221,7 +221,7 @@
['branch', '--stacked', 'trunk', 'shallow'])
# We should notify the user that we upgraded their format
self.assertEqualDiff(
- 'Source format does not support stacking, using format: 1.6\n'
+ 'Source format does not support stacking, using format: \'1.6\'\n'
' Packs 5 (adds stacking support, requires bzr 1.6)\n'
'\n'
'Created new stacked branch referring to %s.\n' % (trunk.base,),
@@ -234,7 +234,7 @@
# We should notify the user that we upgraded their format
self.assertEqualDiff(
'Source format does not support stacking, using format:'
- ' 1.6.1-rich-root\n'
+ ' \'1.6.1-rich-root\'\n'
' Packs 5 rich-root (adds stacking support, requires bzr 1.6.1)\n'
'\n'
'Created new stacked branch referring to %s.\n' % (trunk.base,),
More information about the bazaar-commits
mailing list