| Index: git_cl.py
|
| diff --git a/git_cl.py b/git_cl.py
|
| index 156d28a6e9b53c3e08221e269b72eab417191563..3ee62f6b3a2a5ef25c564313fc0dc9e078107890 100755
|
| --- a/git_cl.py
|
| +++ b/git_cl.py
|
| @@ -2027,9 +2027,12 @@ def CMDtry(parser, args):
|
| '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,
|
|
|