Chromium Code Reviews| Index: git_cl.py |
| diff --git a/git_cl.py b/git_cl.py |
| index 74a72739bc6c13485a9e2b7a656f745a9fd6c7db..c5ff21846cbe97ac058d2a37103fa68457ca0182 100755 |
| --- a/git_cl.py |
| +++ b/git_cl.py |
| @@ -4856,10 +4856,12 @@ def CMDtry_results(parser, args): |
| cl.GetIssue()) |
| if patchset != cl.GetPatchset(): |
| - print('WARNING: Mismatch between local config and server. Did a previous ' |
| - 'upload fail?\n' |
| - 'By default, git cl try uses latest patchset from codereview.\n' |
| - 'Continuing using patchset %s.\n' % patchset) |
| + print('Warning: Codereview server has newer patchsets (%s) than most ' |
| + 'recent upload from local checkout (%s). Did a previous upload ' |
| + 'fail?\n' |
| + 'By default, git cl try uses latest patchset from codereview, ' |
| + 'continuing using such patchset %s.\n' % |
|
emso
2016/10/07 06:56:27
How about "continuing to use patchset" instead?
tandrii(chromium)
2016/10/07 12:26:51
good idea!
|
| + (patchset, cl.GetPatchset(), patchset)) |
| try: |
| jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset) |
| except BuildbucketResponseException as ex: |