Rev 6435: (gz) Avoid failure in bb.test_commit from unrelated bug with NFD filenames in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6435 [merge]
revision-id: pqm at pqm.ubuntu.com-20120106110523-qli0nvcwczglhfyk
parent: pqm at pqm.ubuntu.com-20120105174644-3in053mac5now0up
parent: martin.packman at canonical.com-20120105173015-9h4ekgmwystim7og
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2012-01-06 11:05:23 +0000
message:
  (gz) Avoid failure in bb.test_commit from unrelated bug with NFD filenames
   on OSX (Martin Packman)
modified:
  bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
=== modified file 'bzrlib/tests/blackbox/test_commit.py'
--- a/bzrlib/tests/blackbox/test_commit.py	2012-01-05 13:02:31 +0000
+++ b/bzrlib/tests/blackbox/test_commit.py	2012-01-06 11:05:23 +0000
@@ -859,12 +859,12 @@
         Regression test for bug 185211.
         """
         tree = self.make_branch_and_tree('.')
-        self.build_tree([u'abc\xc3/', u'abc\xc3/foo'])
+        self.build_tree([u'abc\xa7/', u'abc\xa7/foo'])
 
-        tree.add([u'abc\xc3/', u'abc\xc3/foo'])
+        tree.add([u'abc\xa7/', u'abc\xa7/foo'])
         tree.commit('checkin')
 
-        tree.rename_one(u'abc\xc3','abc')
+        tree.rename_one(u'abc\xa7','abc')
 
         self.run_bzr('ci -m "non-ascii mv"')