Date: Wed, 1 Jun 2016 13:59:43 -0700 From: Ngie Cooper <yaneurabeya@gmail.com> To: Don Lewis <truckman@freebsd.org> Cc: "freebsd-hackers@freebsd.org" <freebsd-hackers@freebsd.org> Subject: Re: how to MFC when the target moved? Message-ID: <CAGHfRMBO2GP-ZY1ZS57K=m%2BP2MMZOyitjykfcLYfhH1gu-Zb%2BQ@mail.gmail.com> In-Reply-To: <201606011804.u51I4NrN036166@gw.catspoiler.org> References: <201606011804.u51I4NrN036166@gw.catspoiler.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, Jun 1, 2016 at 11:04 AM, Don Lewis <truckman@freebsd.org> wrote: > I'd like to MFC r300705, which updates usr.bin/fortune/unstr/unstr.c, > but fortune moved from /usr/games to /usr/bin between FreeBSD 10 and 11. > What is the best way to proceed? Manually apply the patch and direct > commit? Something like this is what you want to do when recording the merge.. Cheers! -Ngie cd /usr/src svn merge -c <revision> --record-only ^/head patch file manually svn commit $PWD
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAGHfRMBO2GP-ZY1ZS57K=m%2BP2MMZOyitjykfcLYfhH1gu-Zb%2BQ>