From owner-freebsd-testing@FreeBSD.ORG Mon Jan 20 21:03:50 2014 Return-Path: Delivered-To: freebsd-testing@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C3D117FD for ; Mon, 20 Jan 2014 21:03:50 +0000 (UTC) Received: from mail-pa0-x22f.google.com (mail-pa0-x22f.google.com [IPv6:2607:f8b0:400e:c03::22f]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9A42E1A9B for ; Mon, 20 Jan 2014 21:03:50 +0000 (UTC) Received: by mail-pa0-f47.google.com with SMTP id kp14so7469389pab.34 for ; Mon, 20 Jan 2014 13:03:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=6ZAFDRFUYVOlFpCNXJ/0EVyYoabWjc0lWHJVuDZLKM4=; b=gExSqxXxdiHspTKj0Hs75Pc97j6Nof2yL5bXA5lWxhhFSo3v/YPftFIkVBM31obsfl yJioPA6a4+ltNdV9MGGvrPMUo7VqttlCh/NAHSeAUK2BjXy/HN7KoP09VTkYhAGNUhdA 21CECof8GHXR6Aq3802IQ2402xSVy+IMabLmulBNYgl7ybiD7MhUzSGLsLX8bUAb05gk 2JMGbnRctjpR8jN90nipjYyNnKL8HSJd/aAV71+ccViqVY7PbIbnol90Yjq1Rk+uzvzO BRxHmHOBUJELHngS8wJ8etDMgw32OZKagEOhlXrxgN0q6rtKWP8EFqAjjVUH2Hy/b+oR XiWw== MIME-Version: 1.0 X-Received: by 10.66.163.2 with SMTP id ye2mr20561015pab.110.1390251830231; Mon, 20 Jan 2014 13:03:50 -0800 (PST) Sender: sjk4015@gmail.com Received: by 10.68.114.101 with HTTP; Mon, 20 Jan 2014 13:03:50 -0800 (PST) In-Reply-To: <4D9C5320-2A97-4CCF-A5FB-8AA6BC961207@gmail.com> References: <6079AD8F-5EBB-431C-A06B-9B51E2729F5A@gmail.com> <4D9C5320-2A97-4CCF-A5FB-8AA6BC961207@gmail.com> Date: Mon, 20 Jan 2014 16:03:50 -0500 X-Google-Sender-Auth: 4uutOV9cXCrAR2dpvWOZuPgJCpg Message-ID: Subject: Re: [PATCH] convert bin/date over to ATF From: Steven Kreuzer To: Garrett Cooper Content-Type: text/plain; charset=ISO-8859-1 Cc: freebsd-testing@freebsd.org X-BeenThere: freebsd-testing@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Testing on FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Jan 2014 21:03:50 -0000 On Mon, Jan 20, 2014 at 3:57 PM, Garrett Cooper wrote: > On Jan 20, 2014, at 12:44 PM, Steven Kreuzer wrote: > >> Hey Garrett- >> >> Unless I am doing something stupid, I can't get this patch doesn't >> apply cleaning against head r260913 > > Hi Steven! > > svn patch works better (in fact I never ever use raw patch(1) nowadays when working with svn) and it seems to work properly with git produced diffs: > > # svn patch /root/convert-bin-date-over-to-atf.patch > U bin/date/tests/Makefile > D bin/date/tests/legacy_test.sh > A bin/date/tests/regress.sh > # svn --version | head -1 > svn, version 1.8.5 (r1542147) heh... turns out I was doing something stupid :) I am able to get both of your patches to apply cleanly with svn patch. Thanks!