noop check

git_drover.py

 #!/usr/bin/env python
 # Copyright 2015 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.
 """git drover: A tool for merging changes to release branches."""
 
 import argparse
 import cPickle
 import functools
 import logging
 import os
 import shutil
 import subprocess
 import sys
 import tempfile
 
 import git_common
 
 
 class Error(Exception):
   pass
 
 
+
 _PATCH_ERROR_MESSAGE = """Patch failed to apply.
 
 A workdir for this cherry-pick has been created in
   {0}
 
 To continue, resolve the conflicts there and run
   git drover --continue {0}
 
 To abort this cherry-pick run
   git drover --abort {0}
@@ skipping 381 matching lines @@
       cherry_pick_change(options.branch, options.cherry_pick,
                          options.parent_checkout, options.dry_run,
                          options.verbose)
   except Error as e:
     print 'Error:', e.message
     sys.exit(128)
 
 
 if __name__ == '__main__':
   main()