Bazaar

Merge lp:~gz/bzr/trivial_test_commit_fail_nfd into lp:bzr

  1. trivial_test_commit_fail_nfd
  2. Merge into bzr.dev
Proposed by Martin Packman
Status: Merged
Approved by: Martin Packman
Approved revision: no longer in the source branch.
Merged at revision: 6435
Proposed branch: lp:~gz/bzr/trivial_test_commit_fail_nfd
Merge into: lp:bzr
Diff against target: 18 lines (+3/-3)
1 file modified
bzrlib/tests/blackbox/test_commit.py (+3/-3)
To merge this branch: bzr merge lp:~gz/bzr/trivial_test_commit_fail_nfd
Reviewer Review Type Date Requested Status
bzr-core Pending
Review via email: mp+87663@code.launchpad.net

Commit message

Avoid failure in bb.test_commit from unrelated bug with NFD filenames on OSX

To post a comment you must log in.
Revision history for this message
Martin Packman (gz) wrote :

sent to pqm by email

Revision history for this message
Martin Packman (gz) wrote :

sent to pqm by email

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/tests/blackbox/test_commit.py'
2--- bzrlib/tests/blackbox/test_commit.py 2011-12-30 15:26:18 +0000
3+++ bzrlib/tests/blackbox/test_commit.py 2012-01-05 17:46:26 +0000
4@@ -861,12 +861,12 @@
5 Regression test for bug 185211.
6 """
7 tree = self.make_branch_and_tree('.')
8- self.build_tree([u'abc\xc3/', u'abc\xc3/foo'])
9+ self.build_tree([u'abc\xa7/', u'abc\xa7/foo'])
10
11- tree.add([u'abc\xc3/', u'abc\xc3/foo'])
12+ tree.add([u'abc\xa7/', u'abc\xa7/foo'])
13 tree.commit('checkin')
14
15- tree.rename_one(u'abc\xc3','abc')
16+ tree.rename_one(u'abc\xa7','abc')
17
18 self.run_bzr('ci -m "non-ascii mv"')
19