coapp-developers team mailing list archive

[Vincent Povirk <madewokherd@xxxxxxxxx>]

>> The two things that spring to mind here:
>> * Library A needs work to make it good for us. Library A is then updated -
>> what work do we need to do keep pace with mainline?
>
> Glare at it sternly.
>
> Honestly most of the work in these cases gets put on setting up the
> build system around whichever #ifdef patterns are necessary get things
> to build, and patching in new #ifdef commands if necessary.
>
> Point is to create a single diff against the source (not the build
> stuff) which can be inspected for changes when new versions arrive.

This is what git merge is for (and why it's very important that we
have commits containing the pristine source, separate from our
changes).