From owner-freebsd-current@FreeBSD.ORG Tue Aug 6 14:26:48 2013 Return-Path: Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 3DFBAC51 for ; Tue, 6 Aug 2013 14:26:48 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id 810862155 for ; Tue, 6 Aug 2013 14:26:47 +0000 (UTC) Received: from porto.starpoint.kiev.ua (porto-e.starpoint.kiev.ua [212.40.38.100]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id RAA08821 for ; Tue, 06 Aug 2013 17:26:40 +0300 (EEST) (envelope-from avg@FreeBSD.org) Received: from localhost ([127.0.0.1]) by porto.starpoint.kiev.ua with esmtp (Exim 4.34 (FreeBSD)) id 1V6iDf-000KAg-SP for freebsd-current@FreeBSD.org; Tue, 06 Aug 2013 17:26:40 +0300 Message-ID: <52010768.6090902@FreeBSD.org> Date: Tue, 06 Aug 2013 17:25:44 +0300 From: Andriy Gapon User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130708 Thunderbird/17.0.7 MIME-Version: 1.0 To: FreeBSD Current Subject: weird patch(1) behavior X-Enigmail-Version: 1.5.1 Content-Type: text/plain; charset=X-VIET-VPS Content-Transfer-Encoding: 7bit X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Aug 2013 14:26:48 -0000 ... Patching file xxxx using Plan A... Hunk #1 succeeded at 53 with fuzz 1 (offset -2 lines). patch: **** misordered hunks! output would be garbled But what I see is that patching actually fails. So: "Hunk #1 succeeded" is a lie, it did not succeed - target file was not changed at all. "**** misordered hunks!" is a lie, because the whole patch consisted of exactly one hunk. This was quite confusing. $ patch --version Patch version 2.1 gpatch worked as expected: patching file xxxx Hunk #1 FAILED at 55. 1 out of 1 hunk FAILED -- saving rejects to file xxxx.rej -- Andriy Gapon