Date: Wed, 1 Jun 2016 15:12:02 -0700 (PDT) From: Don Lewis <truckman@FreeBSD.org> To: yaneurabeya@gmail.com Cc: freebsd-hackers@freebsd.org Subject: Re: how to MFC when the target moved? Message-ID: <201606012212.u51MC2UR036796@gw.catspoiler.org> In-Reply-To: <CAGHfRMBO2GP-ZY1ZS57K=m%2BP2MMZOyitjykfcLYfhH1gu-Zb%2BQ@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On 1 Jun, Ngie Cooper wrote: > 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! Hmn ... it wants to record merginfo into sys/gnu/dts when I do that ... mousie:src 382%svn merge -c 300705 --record-only '^/head/' . --- Recording mergeinfo for merge of r300705 into '.': U . --- Recording mergeinfo for merge of r300705 into 'sys/gnu/dts': U sys/gnu/dts It doesn't to that if I omit --record-only.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606012212.u51MC2UR036796>