Don't eat newlines in CL descriptions when merging changes using drover.

drover.py

 #!/usr/bin/env python
 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import optparse
 import os
 import re
 import sys
 
@@ skipping 100 matching lines @@
     return False
   repo_root = info["Repository Root"]
   info = getSVNInfo(os.path.dirname(os.path.abspath(path)), "HEAD")
   if (info.get("Repository Root", None) != repo_root):
     return True
   return False
 
 def getRevisionLog(url, revision):
   """Takes an svn url and gets the associated revision."""
   svn_log = subprocess2.check_output(
-      ['svn', 'log', url, '-r', str(revision)]).splitlines()
-  # Don't include the header lines and the trailing "---..." line and eliminate
-  # any '\r's.
-  return ''.join([l.replace('\r','') for l in svn_log[3:-1]])
+      ['svn', 'log', url, '-r', str(revision)],
+      universal_newlines=True).splitlines(True)
+  # Don't include the header lines and the trailing "---..." line.
+  return ''.join(svn_log[3:-1])
 
 def getSVNVersionInfo():
   """Extract version information from SVN"""
   svn_info = subprocess2.check_output(['svn', '--version']).splitlines()
   info = {}
   for line in svn_info:
     match = re.search(r"svn, version ((\d+)\.(\d+)\.(\d+))", line)
     if match:
       info['version'] = match.group(1)
       info['major'] = int(match.group(2))
@@ skipping 411 matching lines @@
 
   if options.local and (options.revert or options.branch):
     option_parser.error("--local cannot be used with --revert or --branch")
     return 1
 
   return drover(options, args)
 
 
 if __name__ == "__main__":
   sys.exit(main())