Project: chromium Issues People Development process History Sign in
New issue
Advanced search Search tips
Issue 128744 git cl patch & CQ should support patching files with CR/LF
Starred by 4 users Project Member Reported by fischman@chromium.org, May 18 2012 Back to list
Status: WontFix
Owner: ----
Closed: Jun 2014
Components:
EstimatedDays: ----
NextAction: ----
OS: ----
Pri: 2
Type: Bug



Sign in to add a comment
Today trying to patch a file that already has CR/LF line endings fails with a message like:

Failed to apply patch for chrome/installer/setup/DEPS:
While running patch -p1 --forward --force;
patching file chrome/installer/setup/DEPS
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file chrome/installer/setup/DEPS.rej

(for example see the reviewlog of https://chromiumcodereview.appspot.com/10332251/)

This happens if trying to "git cl patch" or land via the CQ (probably b/c CQ does the former, too).  IWBN if the patch worked in the presence of CR/LF, or at least failed with a more obvious message.
 
Project Member Comment 1 by bugdroid1@chromium.org, Aug 1 2012
The following revision refers to this bug:
    http://src.chromium.org/viewvc/chrome?view=rev&revision=149516

------------------------------------------------------------------------
r149516 | dalecurtis@google.com | 2012-08-01T22:29:22.884340Z

Changed paths:
   M http://src.chromium.org/viewvc/chrome/trunk/src/third_party/jemalloc/chromium/jemalloc.c?r1=149516&r2=149515&pathrev=149516

Add je_memalign prototype.CQ can't commit this due to CrLf line endings, so land manually.  See  http://crbug.com/128744 .

BUG=none
TBR=jar
------------------------------------------------------------------------
Project Member Comment 2 by bugdroid1@chromium.org, Mar 10 2013
Labels: -Area-Internals Cr-Internals
Issue 352875 has been merged into this issue.
Labels: Infra
Comment 5 by aga...@chromium.org, Jun 26 2014
Status: WontFix
Obsolete.
Sign in to add a comment