[[[
* svnmerge_test.py
  (TestCase_TestRepo.testCommitMessageEncoding): skip the test if there
  is no system default encoding
Patch by: Dustin J. Mitchell <dustin@zmanda.com>
]]]
Index: svnmerge_test.py
===================================================================
--- svnmerge_test.py	(revision 30543)
+++ svnmerge_test.py	(working copy)
@@ -1258,16 +1258,20 @@
         containing non-ASCII caracters, merge, commit, and verify the commit
         message was correctly encoded."""
 
+        commit_msg = u"adição no repositório"
+        input_encoding = locale.getdefaultlocale()[1]
+        output_encoding = sys.stdout.encoding
+
+        # if input_encoding is None, then we are not configured to handle
+        # non-ASCII characters, so there's nothing to test here.
+        if not input_encoding: return
+
         # Initialize svnmerge
         self.svnmerge2(["init", self.test_repo_url + "/trunk"])
         self.launch("svn commit -F svnmerge-commit-message.txt",
                     match = r"Committed revision 14")
         os.remove("svnmerge-commit-message.txt")
 
-        commit_msg = u"adição no repositório"
-        input_encoding = locale.getdefaultlocale()[1]
-        output_encoding = sys.stdout.encoding
-
         # Create a file
         os.chdir("../trunk")
         open("newfile", "w").close()