Richard Hartmann, 16.11.2008: > On Sun, Nov 16, 2008 at 20:36, Markus Heidelberg > <[EMAIL PROTECTED]> wrote: > > > However, we would only want the file(s) with the modified-by defined to use > > this "union" merge driver and there only the line(s) with this content. But > > after looking into the Makefile, the simle "union" driver is not what we > > want. > > It doesn't help us to have multiple > > CONF_ARGS = --with-modified-by="feature 1" > > CONF_ARGS = --with-modified-by="feature 2" > > among each other. We had to combine it to > > CONF_ARGS = --with-modified-by="feature 1, feature 2" > > You can simply concat the strings into WITH_MODIFIED_BY and then > feed that variable into CONF_ARGS.
Of course, but I don't want to force any habits for the master branch into the patch branches. Someone only looking at a patch wonders why there is a new variable WITH_MODIFIED_BY += "feature 1". I think you mean this syntax. Probably an optional script could do it, detecting with git commands which patches are included and automatically setting --with-modified-by and/or MODIFIED_BY. Maybe it could be a little extension to the Makefile, only available in the master branch. Markus --~--~---------~--~----~------------~-------~--~----~ You received this message from the "vim_use" maillist. For more information, visit http://www.vim.org/maillist.php -~----------~----~----~----~------~----~------~--~---
