Date: Wed, 1 Jun 2016 15:41:57 -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: <201606012242.u51Mfvdw036856@gw.catspoiler.org> In-Reply-To: <CAGHfRMBAaErJwHfW4FE3xqw1d1t%2BhpZ3sHPMFOEw0JwfU--CPA@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 3:12 PM, Don Lewis <truckman@freebsd.org> wrote: >> 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. > > Eh... revert those items. Not sure why it's trying to merge in that > mergeinfo... Yeah, I managed to figure out the revert workaround on my own. It seems to be a svn bug with --record-only. I merged a whole bunch of other stuff earlier and didn't run into this.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606012242.u51Mfvdw036856>