← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_nonascii.py

  • Committer: Michael Ellerman
  • Date: 2005-12-10 22:11:13 UTC
  • mto: This revision was merged to the branch mainline in revision 1528.
  • Revision ID: michael@ellerman.id.au-20051210221113-99ca561aaab4661e
Simplify handling of DivergedBranches in cmd_pull()

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_nonascii.py
18
18
 
19
19
import os
20
20
 
21
 
from bzrlib.selftest import TestCaseInTempDir
 
21
from bzrlib.tests import TestCaseInTempDir
22
22
from bzrlib.branch import Branch
23
23
 
24
24
 
30
30
        try:
31
31
            os.mkdir(br_dir)
32
32
            os.chdir(br_dir)
33
 
        except EncodingError:
 
33
        except UnicodeEncodeError:
34
34
            self.log("filesystem can't accomodate nonascii names")
35
35
            return
36
36
        br = Branch.initialize(u".")
37
37
        file("a", "w").write("hello")
38
 
        br.add(["a"], ["a-id"])
 
38
        br.working_tree().add(["a"], ["a-id"])