Handle empty "svn log" commit messages

diff --git a/svn2svn/svnclient.py b/svn2svn/svnclient.py
index e5e8abc38ca4eaf18a3c19e8bad733fbe29ecdef..04f5eeef7a1a47c85594f565c3066c87c6c1e447 100644 (file)
--- a/svn2svn/svnclient.py
+++ b/svn2svn/svnclient.py
@@ -91,7 +91,7 @@ def parse_svn_log_xml(xml_string):
             d['date'] = svn_date_to_timestamp(date.text)
         else:
             d['date'] = None
-        d['message'] = msg is not None and msg.text.replace('\r\n', '\n').replace('\n\r', '\n').replace('\r', '\n') or ""
+        d['message'] = msg is not None and msg.text and msg.text.replace('\r\n', '\n').replace('\n\r', '\n').replace('\r', '\n') or ""
         paths = []
         for path in entry.findall('.//paths/path'):
             copyfrom_rev = path.get('copyfrom-rev')

diff --git a/tests/make-ref-repo.sh b/tests/make-ref-repo.sh
index c0af8cf71ce1e711a023a8a40a2843ae0e1afd9d..004f1a5ba7bf17865202bf8bc23edab1f2e88834 100755 (executable)
--- a/tests/make-ref-repo.sh
+++ b/tests/make-ref-repo.sh
@@ -61,6 +61,10 @@ svn ci -q --with-revprop 'testprop=Test 1 message' -m "Test 1: Add Module/Projec
 svn up -q
 show_last_commit
 
+# Empty commit message
+echo "Module/ProjectB/FileB1.txt (Test 1.1)" >> $WC/Module/ProjectB/FileB1.txt
+svn_commit ""
+
 # Test #2: Rename files
 # * Test rename support
 # * Test committing rename in two different branch commits: first deletion, then add