Always use latest patchset in git-cl try

git_cl.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 """A git-command for integrating reviews on Rietveld."""
 
 import difflib
@@ skipping 2009 matching lines @@
       if t != ['compile'])
 
   if any('triggered' in b for b in builders_and_tests):
     print >> sys.stderr, (
         'ERROR You are trying to send a job to a triggered bot.  This type of'
         ' bot requires an\ninitial job from a parent (usually a builder).  '
         'Instead send your job to the parent.\n'
         'Bot list: %s' % builders_and_tests)
     return 1
 
-  patchset = cl.GetPatchset()
-  if not cl.GetPatchset():
-    patchset = cl.GetMostRecentPatchset()
+  patchset = cl.GetMostRecentPatchset()
+  if patchset and patchset != cl.GetPatchset():
+    print(
+        '\nWARNING Mismatch between local config and server. Did a previous '
+        'upload fail?\ngit-cl try always uses latest patchset from rietveld. '
+        'Continuing using\npatchset %s.\n' % patchset)
 
   cl.RpcServer().trigger_try_jobs(
       cl.GetIssue(), patchset, options.name, options.clobber, options.revision,
       builders_and_tests)
   print('Tried jobs on:')
   length = max(len(builder) for builder in builders_and_tests)
   for builder in sorted(builders_and_tests):
     print '  %*s: %s' % (length, builder, ','.join(builders_and_tests[builder]))
   return 0
 
@@ skipping 231 matching lines @@
   GenUsage(parser, 'help')
   return CMDhelp(parser, argv)
 
 
 if __name__ == '__main__':
   # These affect sys.stdout so do it outside of main() to simplify mocks in
   # unit testing.
   fix_encoding.fix_encoding()
   colorama.init()
   sys.exit(main(sys.argv[1:]))