Patch failures with dependent patches + deleted files

[Ken Rockot]

I have an issue where one CL modifies a file, and a dependent follow-up CL deletes the file.

The second CL always encounters a patch failure with an error which appears to indicate that the CLs are applied locally in succession without separate commits (i.e. "git rm" fails because "the following file has changes staged in the index")

I don't know where the boundaries lie between all the different pieces of this system, so I can't tell if this is just a Rietveld bug that will never be fixed, or something which actually needs attention in infra. 

Any ideas? Workarounds (aside from the obvious of just waiting for CL 1 to land?)

[Primiano Tucci]

+infra-dev

--
--
Chromium Developers mailing list: chromi...@chromium.org
View archives, change email options, or unsubscribe:
http://groups.google.com/a/chromium.org/group/chromium-dev
---
You received this message because you are subscribed to the Google Groups "Chromium-dev" group.
To view this discussion on the web visit https://groups.google.com/a/chromium.org/d/msgid/chromium-dev/CA%2BapAgGUY%2BgRGHCUY80k6WhSbEBnFFLjQH6G1zvv9gRYfTcmZA%40mail.gmail.com.

[Aaron Gable]

This seems like a bug in bot_update. +Ryan Tseng and +Andrii Shyshkalov who have done the most work there, I believe.

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/CA%2ByH71frAGBcaSyn6giMfQ9sOESMYykyFmqU-2P5JB6%3DnHn1kQ%40mail.gmail.com.

[Ryan Tseng]

Do you have any links?

On Mon, Mar 13, 2017 at 3:48 PM, Aaron Gable <aga...@chromium.org> wrote:

This seems like a bug in bot_update. +Ryan Tseng and +Andrii Shyshkalov who have done the most work there, I believe.

On Mon, Mar 13, 2017 at 10:17 AM Primiano Tucci <prim...@chromium.org> wrote:

+infra-dev

On Mon, Mar 13, 2017 at 5:05 PM Ken Rockot <roc...@chromium.org> wrote:

I have an issue where one CL modifies a file, and a dependent follow-up CL deletes the file.

The second CL always encounters a patch failure with an error which appears to indicate that the CLs are applied locally in succession without separate commits (i.e. "git rm" fails because "the following file has changes staged in the index")

I don't know where the boundaries lie between all the different pieces of this system, so I can't tell if this is just a Rietveld bug that will never be fixed, or something which actually needs attention in infra. 

Any ideas? Workarounds (aside from the obvious of just waiting for CL 1 to land?)

--
--
Chromium Developers mailing list: chromi...@chromium.org
View archives, change email options, or unsubscribe:
http://groups.google.com/a/chromium.org/group/chromium-dev
---
You received this message because you are subscribed to the Google Groups "Chromium-dev" group.
To view this discussion on the web visit https://groups.google.com/a/chromium.org/d/msgid/chromium-dev/CA%2BapAgGUY%2BgRGHCUY80k6WhSbEBnFFLjQH6G1zvv9gRYfTcmZA%40mail.gmail.com.

--
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+unsubscribe@chromium.org.

[Noel Gordon]

Ryan,

On Tuesday, March 14, 2017 at 10:14:16 AM UTC+11, Ryan Tseng wrote:

Do you have any links?

https://codereview.chromium.org/2699663003/#ps100001 

Wanted to git rm   extensions/common/extension_utility_messages.h, patch won't apply.

 

On Mon, Mar 13, 2017 at 3:48 PM, Aaron Gable <aga...@chromium.org> wrote:

This seems like a bug in bot_update. +Ryan Tseng and +Andrii Shyshkalov who have done the most work there, I believe.

On Mon, Mar 13, 2017 at 10:17 AM Primiano Tucci <prim...@chromium.org> wrote:

+infra-dev

On Mon, Mar 13, 2017 at 5:05 PM Ken Rockot <roc...@chromium.org> wrote:

I have an issue where one CL modifies a file, and a dependent follow-up CL deletes the file.

The second CL always encounters a patch failure with an error which appears to indicate that the CLs are applied locally in succession without separate commits (i.e. "git rm" fails because "the following file has changes staged in the index")

I don't know where the boundaries lie between all the different pieces of this system, so I can't tell if this is just a Rietveld bug that will never be fixed, or something which actually needs attention in infra. 

Seems like a bug to me.

 

Any ideas? Workarounds (aside from the obvious of just waiting for CL 1 to land?)

Workaround: #ifdef 0 / #endif the code you want to git rm, and upload that.  Not ideal, but your patch and it dependents will apply [1].

~noel

[1] https://codereview.chromium.org/2699663003/#ps160001

[Ken Rockot]

https://codereview.chromium.org/2744943002 is another affected CL.

[Julie Parent]

Has anyone been able to follow up on this?

To view this discussion on the web visit https://groups.google.com/a/chromium.org/d/msgid/infra-dev/CA%2BapAgEy%3DKYJPjZb_c%2BBvXGioPngOFOYiDOZqW2tkjpbWNy2qg%40mail.gmail.com.

[Erik Staab]

Thanks for reporting this. There seems to be a bug on file for this already, we can take the discussion there:

http://crbug.com/665222

To view this discussion on the web visit https://groups.google.com/a/chromium.org/d/msgid/infra-dev/CAPSmAARbtKyuGfv5hA7V19iM%2B21aXwsMQaRVP13d6R0q6uJnhA%40mail.gmail.com.