moz-phab doesn't correctly detect files without trailing newlines, resulting in patches that cannot be landed.
Categories
(Conduit :: moz-phab, defect, P1)
Tracking
(Not tracked)
People
(Reporter: mgaudet, Assigned: glob)
References
Details
(Keywords: conduit-triaged)
Attachments
(2 files)
I seem to be having trouble landing a patch that removes a file, and I'm not super clear on why. As near as I can tell, the file hasn't been modified since I first landed it; yet the landing fails
applying /tmp/tmpO_JPtY 1 out of 1 hunk ignored -- saving rejects to file js/src/jit-test/tests/bug1580378.js.rej abort: patch command failed: exited with status 256
https://lando.services.mozilla.com/D60461/ is the patch stack that won't land, and https://phabricator.services.mozilla.com/D60452 is the only diff in the stack that touches (deletes!) bug1580378.js
if I look at the diff locally, it looks like it was deleted:
diff --git a/js/src/jit-test/tests/bug1580378.js b/js/src/jit-test/tests/bug1580378.js
deleted file mode 100644
--- a/js/src/jit-test/tests/bug1580378.js
+++ /dev/null
Aryx helpfully pointed out in #lando on slack: bug1580378.js
is missing a trailing newline; so in a preceeding patch, I added a newline, then deleted and it landed.
It appears this is not the only case of this: https://lando.services.mozilla.com/D59763/ is another case.
Thanks for the clear bug report - investigating.
:bytesized as a workaround you can ask a sheriff to manually land your patch.
Looks like the diff generated by moz-phab doesn't contain the marker that the deleted file is lacking a trailing newline.
Description
•