Some changes "Cannot merge" in gerrit

[Waldemar Rymarkiewicz]

Hi,

I am trying to push below changes upstream, but I see in gerrit that 3 of them "Cannot Merge"  I don't get where the problem is and how to solve it?

This is the right order of merge (all depends on each other)

https://chromium-review.googlesource.com/#/c/340971/
https://chromium-review.googlesource.com/#/c/340972/
https://chromium-review.googlesource.com/#/c/340974/
https://chromium-review.googlesource.com/#/c/359530/
https://chromium-review.googlesource.com/#/c/359531/

I see parent pointers point to the right change, but how to submit all together to commit queue ?

Anyone could explain?

Thanks,

/Waldek

[Mike Frysinger]

you have to look at the whole line and not just part of it.  the whole line says:

Strategy Cherry Pick Cannot Merge

that means gerrit is telling you what would happen if it was submitted using cherry picking.

in your case, it doesn't really matter because you've set up the parents correctly, and because you wouldn't be submitting yourself.  you'd set CQ+1 and the bots would make sure to land in the correct order -- they handle gerrit deps/parents sanely.

-mike

--
--
Chromium OS Developers mailing list: chromiu...@chromium.org
View archives, change email options, or unsubscribe:
http://groups.google.com/a/chromium.org/group/chromium-os-dev?hl=en

[Waldemar Rymarkiewicz]

Many thanks for clarification.

Purely theoretically, how to setup dependency if I have changes in
different projects that should be merged together? Is that possible?

Thanks
/Waldek

> ---
> You received this message because you are subscribed to the Google Groups
> "Chromium OS dev" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to chromium-os-d...@chromium.org.

[Mike Frysinger]

iiuc, this should answer your question:

http://dev.chromium.org/developers/tree-sheriffs/sheriff-details-chromium-os/commit-queue-overview#TOC-How-do-I-specify-the-dependencies-of-a-change-

ii<dont>uc, then please clarify :).

-mike

> email to chromium-os-dev+unsubscribe@chromium.org.