Index: examples/rietveld/patches/upload.diff
===================================================================
--- a/examples/rietveld/patches/upload.diff
+++ b/examples/rietveld/patches/upload.diff
@@ -91,3 +91,13 @@
def GetUserCredentials():
"""Prompts the user for a username and password."""
+@@ -1600,6 +1600,8 @@ class PerforceVCS(VersionControlSystem):
+ if marshal_output:
+ # -G makes perforce format its output as marshalled python objects
+ args.extend(["-G"])
++ # you should NEVER use universal_newlines with marshalled objects
++ universal_newlines = False
+ if self.p4_port:
+ args.extend(["-p", self.p4_port])
+ if self.p4_client:
+