Index: mergebot/trunk/mergebot/svn.py
===================================================================
--- mergebot/trunk/mergebot/svn.py	(revision 55)
+++ mergebot/trunk/mergebot/svn.py	(revision 56)
@@ -158,5 +158,5 @@
                     "from svn merge operation; the 5th character should " \
                     "always be a space.  Invalid output line was %r.\nFull output was: %r." % (line, output)
-                filename = line[5:-1] # (strip trailing newline)
+                filename = line[5:]
                 status = line[:4].rstrip()
             results.append((status, filename))
Index: mergebot/trunk/utils/test.py
===================================================================
--- mergebot/trunk/utils/test.py	(revision 55)
+++ mergebot/trunk/utils/test.py	(revision 56)
@@ -112,5 +112,5 @@
         tc.find('CheckMerge')
         self.go_to_ticket(ticket_id)
-        tc.find('Rebranched from .* for .*')
+        tc.find('(Rebranched from .* for .*|There were conflicts on rebranching)')
         retval = call(['svn', 'ls', self.repo_url + '/' + component + '/branches/ticket-%s' % ticket_id],
                     stdout=logfile, stderr=logfile)