Date: Mon, 20 Jan 2014 16:03:50 -0500 From: Steven Kreuzer <skreuzer@freebsd.org> To: Garrett Cooper <yaneurabeya@gmail.com> Cc: freebsd-testing@freebsd.org Subject: Re: [PATCH] convert bin/date over to ATF Message-ID: <CAFFB%2BpSph_Mvzazh-wta_XUn7iir_oXo0TXv7OfKfv0vnxK3Ng@mail.gmail.com> In-Reply-To: <4D9C5320-2A97-4CCF-A5FB-8AA6BC961207@gmail.com> References: <6079AD8F-5EBB-431C-A06B-9B51E2729F5A@gmail.com> <CAFFB%2BpTz3nmDX%2BZ1583BJLfqc8-T3nt2qZHNUu0PbW4XNbwLgg@mail.gmail.com> <4D9C5320-2A97-4CCF-A5FB-8AA6BC961207@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, Jan 20, 2014 at 3:57 PM, Garrett Cooper <yaneurabeya@gmail.com> wrote: > On Jan 20, 2014, at 12:44 PM, Steven Kreuzer <skreuzer@freebsd.org> 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!
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFFB%2BpSph_Mvzazh-wta_XUn7iir_oXo0TXv7OfKfv0vnxK3Ng>