Date: Fri, 25 Dec 2020 04:18:22 -0800 From: David Wolfskill <david@catwhisker.org> To: Jonathan Chen <jonc@chen.org.nz> Cc: Kyle Evans <kevans@freebsd.org>, FreeBSD-STABLE Mailing List <freebsd-stable@freebsd.org> Subject: Re: git, $FreeBSD$ and mergemaster Message-ID: <X%2BXYjupHKfyEekPL@albert.catwhisker.org> In-Reply-To: <CAJuc1zNQJyJyvYJAEM2Gcv0cc2XSQANHL8wjiZ7Z6QWFNzoaUw@mail.gmail.com> References: <CAJuc1zNmSJ_qcJSSEFnihE4aLNvjZKUVgFA8GKrymmJ38qSfDw@mail.gmail.com> <CACNAnaHaNqXzGqzG0KaHJSc_K_9fDWCOaApm2K%2BG9uzKGKc5WQ@mail.gmail.com> <CAJuc1zNQJyJyvYJAEM2Gcv0cc2XSQANHL8wjiZ7Z6QWFNzoaUw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--NnQfTabPFY0sXC+y Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Dec 25, 2020 at 10:00:57PM +1300, Jonathan Chen wrote: > Hi Kyle, >=20 > 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. >=20 > Thanks for the answer. >=20 > 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. >=20 > Cheers. > --=20 > 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." Peace, david --=20 David H. Wolfskill david@catwhisker.org "Dismissing reality doesn't make it go away." - Rajiv Shah, Rockefeller Foundation president See https://www.catwhisker.org/~david/publickey.gpg for my public key. --NnQfTabPFY0sXC+y Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE4owz2QxMJyaxAefyQLJg+bY2PckFAl/l2I5fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUy OEMzM0Q5MEM0QzI3MjZCMTAxRTdGMjQwQjI2MEY5QjYzNjNEQzkACgkQQLJg+bY2 PcmT1Qf/aSGEGRCHqM1XXooH6l64zmH9Nnt6U5+AXqv32/RikJLZOYENjOQ8aefw 4c2lTC1CqQXODlFIWYzWbNFeo8ivypRKsCm5SA3bWqPD97+a2tizUFsfAK17RQCX yEkhOKNaYjV/yrQ5QS4jqstmlH0Zh+Pgn8g590jnfN6ujJevtOZPcDIRzP6zKc9P ulMqFpg8Fc+OXLxtxQ421rmvV9JlTcQCVc2wF7k2RtUYMNg46NS8Vus+rSYFdsPi 8TUh1TNVRjA9KWW0OXzzBI80hNWJnYWUjbuvuzoNblkoPR8+dLTeeH9dYDzJkEjI 3AbO1bvetUhoUMuI7D6xWUJfwbiQwg== =F+fa -----END PGP SIGNATURE----- --NnQfTabPFY0sXC+y--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?X%2BXYjupHKfyEekPL>