ejcaruso@ejcaruso ~/trunk/src/aosp/system/connectivity/shill $ repo rebase .
# src/aosp/system/connectivity/shill: rebasing minor-cleanup -> refs/remotes/cros/master
Current branch minor-cleanup is up to date.

NingNing, can you see why we can't see the precq logs?

the url wasn't correctly constructed.

you can find one example here :

https://uberchromegw.corp.google.com/i/chromiumos.tryserver/builders/compile_only_pre_cq/builds/16207

12:41:28: INFO: Attempting to cherry-pick change ejcaruso:422556:535c080f:"shill: minor cleanup in dhcp_provider"
Trying simple merge.
Simple merge failed, trying Automatic merge.
Auto-merging dhcp/dhcp_provider.cc
ERROR: content conflict in dhcp/dhcp_provider.cc
fatal: merge program failed
error: could not apply 535c080f... shill: minor cleanup in dhcp_provider
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
Recorded preimage for 'dhcp/dhcp_provider.cc'
12:41:28: INFO: Rewinding transaction: failed changes: ejcaruso:422556:535c080f:"shill: minor cleanup in dhcp_provider" .
Traceback (most recent call last):
  File "/b/build/slave/compile_only_pre_cq/build/chromite/cbuildbot/validation_pool.py", line 1009, in _Transaction
    yield
  File "/b/build/slave/compile_only_pre_cq/build/chromite/cbuildbot/validation_pool.py", line 954, in Apply
    self._ApplyChanges(inducing_change, transaction_changes)
  File "/b/build/slave/compile_only_pre_cq/build/chromite/cbuildbot/validation_pool.py", line 315, in f
    return functor(self, parent, *args, **kwargs)
  File "/b/build/slave/compile_only_pre_cq/build/chromite/cbuildbot/validation_pool.py", line 1044, in _ApplyChanges
    self.ApplyChange(change)
  File "/b/build/slave/compile_only_pre_cq/build/chromite/cbuildbot/validation_pool.py", line 394, in f
    return functor(self, *args, **kwargs)
  File "/b/build/slave/compile_only_pre_cq/build/chromite/cbuildbot/validation_pool.py", line 427, in ApplyChange
    return change.ApplyAgainstManifest(self.manifest, trivial=False)
  File "/b/build/slave/compile_only_pre_cq/build/chromite/lib/patch.py", line 1123, in ApplyAgainstManifest
    trivial=trivial)
  File "/b/build/slave/compile_only_pre_cq/build/chromite/lib/patch.py", line 1086, in Apply
    self.CherryPick(git_repo, trivial=trivial, inflight=inflight)
  File "/b/build/slave/compile_only_pre_cq/build/chromite/lib/patch.py", line 1022, in CherryPick
    raise ApplyPatchException(self, inflight=inflight, files=conflicts)
ApplyPatchException: CL:422556 conflicted with ToT.



This still doesn't make any sense to me at the moment...

need to rebase and resolve conflicts.

not sure what you're checking, but there is def a conflict there

master shill is 36232c3498f8ff1fa90a8703b4c5fba77b9869d7.  that's also what the precq bot says it's checking out to.

that CL is based on b8ab59eb2547e21fcf077e64cb1afb67d3bdcb71 which is much older.

trying to apply that CL on master does conflict because Ben already fixed the issue:
  https://chromium-review.googlesource.com/421139

even Gerrit is saying there's a conflict:
  Strategy	Rebase if Necessary  **Cannot Merge**

click the rebase button if you want to see for sure.

at any rate, there is no bug here, and everything is WAI.  if Eric wants to rebase his CL, he can.

did you upload changes after you rebased, ejcaruso@ ?