floss_patches fix_upstream: Prefer cros/upstream/main

We should prefer the newer commit, and cros/upstream/main should always
be newer or equal to m/main. So this CL replaces "m/main" with
"cros/upstream/main" in fix_upstream task.

This CL also fixed a bug that floss_patches wrongly required
"--cl_number" arg for all use cases. Instead, "--cl_number" arg is
required by the "floss_patch land" command only.

BUG=b:369730989
BUG=b:361231905
TEST=floss_patches fix_upstream; and then --continue;
     generated https://crrev.com/c/5889646
TEST=floss_patches land; This raises an error of missing cl_number

Change-Id: Ib80a2430f3fdd27ae866b8e3fcdcd218f5f65ba9
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/bluetooth/+/5892952
Tested-by: Hsin-chen Chuang <[email protected]>
Commit-Queue: Hsin-chen Chuang <[email protected]>
Reviewed-by: Dean Liao <[email protected]>
1 file changed
tree: fe85958d7d8780b4c2938047f3ddaeb31c5fc0d8
  1. testing/
  2. tools/
  3. .gitignore
  4. DIR_METADATA
  5. OWNERS
  6. PRESUBMIT.cfg