"git cl try" not running properly on dependent CL

[Colin Blundell]

Hi all,

I have this CL and this CL, with the second depending on the first. When running "git cl try" on the second it consistently gives a patch failure even if I sync to ToT in the first, upload it, rebase the second onto the first cleanly, and upload it. I'm running "git cl try -r <rev>", where <rev> is the latest rev on ToT after I synced. Any hints? Possibly related: The first CL was itself dependent on something else when I uploaded it. That something else subsequently landed and I rebased the first CL onto origin/master and changed its upstream to origin/master.

Thanks,

Colin

[Nodir Turakulov]

+Ravi Mistry who implemented CL deps.

Does patch application mechanism CL deps?

--
You received this message because you are subscribed to the Google Groups "infra-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email to infra-dev+...@chromium.org.
To post to this group, send email to infr...@chromium.org.
To view this discussion on the web visit https://groups.google.com/a/chromium.org/d/msgid/infra-dev/CAMGE5NGaTsakTL4qQYFDSh_bx8mT8Qv-V%3D-Nxa2ZMAsbdmMq9A%40mail.gmail.com.

[Ravi Mistry]

On Tue, Aug 25, 2015 at 11:44 AM, Nodir Turakulov <no...@google.com> wrote:

+Ravi Mistry who implemented CL deps.

Does patch application mechanism CL deps?

Yes this is supposed to work. I took a quick look and for some reason it did not apply the dependent CL when apply_issue.py was run.

Taking a closer look now...

[Ravi Mistry]

On Tue, Aug 25, 2015 at 11:47 AM, Ravi Mistry <rmi...@chromium.org> wrote:

On Tue, Aug 25, 2015 at 11:44 AM, Nodir Turakulov <no...@google.com> wrote:

+Ravi Mistry who implemented CL deps.

Does patch application mechanism CL deps?

Yes this is supposed to work. I took a quick look and for some reason it did not apply the dependent CL when apply_issue.py was run.

Taking a closer look now...

I see what the problem is. pgervais@ 16 hours ago deployed an important fix to Rietveld. But the code in depot_tools/rietveld.py is relying on the old incorrect behavior and is correctly failing now. Working on a fix.

[Ravi Mistry]

This should now work. I landed a fix in depot_tools.

I tried kicking off a trybot in your cl/1312143003 but it failed because it needs to be merged to pick up the change from cl/1271123003. Could you please try again after rebasing?

Thanks,

Ravi

[Ravi Mistry]

(Re-sending from my chromium.org account)

This should now work. I landed a fix in depot_tools.

I tried kicking off a trybot in your cl/1312143003 but it failed because it needs to be merged to pick up the change from cl/1271123003. Could you please try again after rebasing?

Thanks,

Ravi

[Colin Blundell]

Thanks! I tried again and it worked.