Change usage of deprecated flag.

Change usage of deprecated flag.

BUG=Every time I run 'git cl upstream' I get "The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to."

Committed: https://chromium.googlesource.com/chromium/tools/depot_tools/+/7a3dd3570e2c3daa403d71fff2d71bc10b5eb0c4

[ghost stip (do not use), 2016-09-21 21:46:24]

Description was changed from

==========
Change usage of deprecated flag.

BUG=Every time I run 'git cl upstream' I get "The --set-upstream flag is
deprecated and will be removed. Consider using --track or --set-upstream-to."
==========

to

==========
Change usage of deprecated flag.

BUG=Every time I run 'git cl upstream' I get "The --set-upstream flag is
deprecated and will be removed. Consider using --track or --set-upstream-to."
==========

[ghost stip (do not use), 2016-09-21 21:46:24]

stip@chromium.org changed reviewers:
+ iannucci@chromium.org, maruel@chromium.org

[ghost stip (do not use), 2016-09-21 21:46:34]

ptal

[iannucci, 2016-09-21 21:54:45]

https://codereview.chromium.org/2352393003/diff/1/git_cl.py
File git_cl.py (right):

https://codereview.chromium.org/2352393003/diff/1/git_cl.py#newcode1378
git_cl.py:1378: '    git branch --set-upstream-to %s trunk\n'
trunk?

Also arguments are swapped:

  git branch --set-upstream-to origin/master [current branch]

https://codereview.chromium.org/2352393003/diff/1/git_cl.py#newcode4872
git_cl.py:4872: RunGit(['branch', '--set-upstream-to', branch, args[0]])
arg order

[ghost stip (do not use), 2016-09-21 23:16:39]

ptal

https://codereview.chromium.org/2352393003/diff/1/git_cl.py
File git_cl.py (right):

https://codereview.chromium.org/2352393003/diff/1/git_cl.py#newcode1378
git_cl.py:1378: '    git branch --set-upstream-to %s trunk\n'
On 2016/09/21 21:54:45, iannucci wrote:
> trunk?
> 
> Also arguments are swapped:
> 
>   git branch --set-upstream-to origin/master [current branch]

Done.

https://codereview.chromium.org/2352393003/diff/1/git_cl.py#newcode4872
git_cl.py:4872: RunGit(['branch', '--set-upstream-to', branch, args[0]])
On 2016/09/21 21:54:45, iannucci wrote:
> arg order

arggggggg.....s

[M-A Ruel, 2016-09-21 23:39:16]

lgtm

[ghost stip (do not use), 2016-09-23 00:29:07]

The CQ bit was checked by stip@chromium.org

[commit-bot: I haz the power, 2016-09-23 00:29:14]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-09-23 00:32:31]

Description was changed from

==========
Change usage of deprecated flag.

BUG=Every time I run 'git cl upstream' I get "The --set-upstream flag is
deprecated and will be removed. Consider using --track or --set-upstream-to."
==========

to

==========
Change usage of deprecated flag.

BUG=Every time I run 'git cl upstream' I get "The --set-upstream flag is
deprecated and will be removed. Consider using --track or --set-upstream-to."

Committed:
https://chromium.googlesource.com/chromium/tools/depot_tools/+/7a3dd3570e2c3d...
==========

[commit-bot: I haz the power, 2016-09-23 00:32:32]

Committed patchset #2 (id:20001) as
https://chromium.googlesource.com/chromium/tools/depot_tools/+/7a3dd3570e2c3d...