Date: Wed, 30 Dec 2020 17:07:19 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= <uqs@freebsd.org> To: David Wolfskill <david@catwhisker.org>, Jonathan Chen <jonc@chen.org.nz>, Kyle Evans <kevans@freebsd.org>, FreeBSD-STABLE Mailing List <freebsd-stable@freebsd.org> Subject: Re: git, $FreeBSD$ and mergemaster Message-ID: <X%2Bylt3fifErOca7W@acme.spoerlein.net> In-Reply-To: <X%2BXYjupHKfyEekPL@albert.catwhisker.org> References: <CAJuc1zNmSJ_qcJSSEFnihE4aLNvjZKUVgFA8GKrymmJ38qSfDw@mail.gmail.com> <CACNAnaHaNqXzGqzG0KaHJSc_K_9fDWCOaApm2K%2BG9uzKGKc5WQ@mail.gmail.com> <CAJuc1zNQJyJyvYJAEM2Gcv0cc2XSQANHL8wjiZ7Z6QWFNzoaUw@mail.gmail.com> <X%2BXYjupHKfyEekPL@albert.catwhisker.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, 2020-12-25 at 04:18:22 -0800, David Wolfskill wrote: >On Fri, Dec 25, 2020 at 10:00:57PM +1300, Jonathan Chen wrote: >> Hi Kyle, >> >> On Thu, 24 Dec 2020 at 15:05, Kyle Evans <kevans@freebsd.org> wrote: >> ... >> > mergemaster only uses it as an optimization, if they're unexpanded >> > throughout then it falls back to diff(1) -- i.e. it's slower without. >> >> Thanks for the answer. >> >> However, wouldn't this mean that every run of "mergemaster" would >> prompt for local changes? The nice thing about using the $FreeBSD$ >> tags was that if I approved a local-change, subsequent runs of >> mergemaster would not prompt me about the local-change unless the >> etc-file had been modified in the source tree. >> >> Cheers. >> -- >> Jonathan Chen <jonc@chen.org.nz> >> .... > >Indeed: the above-described behavior is what I have observed so far >since the transition (tracking head & stable/12 daily on two machines). > >I would go a bit further than stating that the prior behavior was >"nice." The only way forward is full git! Provide the /etc equivalent in a git branch or subdir, then check it out to /etc and handle local changes with git rebase or git merge. (I'm not even joking! :) Cheers Uli
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?X%2Bylt3fifErOca7W>