Greg KH wrote:
On Mon, Oct 03, 2005 at 02:08:36PM -0700, H. Peter Anvin wrote:
quoted
I believe in the medium-to-long term a plugin architecture for merging
is imperative. It's not even different media types, but some *files*
have specific merging policies. Think, for example, of pci.ids in the
Linux kernel tree.
You mean the file that is now removed from the kernel tree? Sure,
that's a good merge policy :)
*Plonk*... well, the point was that even text files can be structured so
that application-specific merge rules can be made to apply. ChangeLogs
are another good example.
-hpa