Richard Hartmann, 16.11.2008:
>
> On Sat, Nov 15, 2008 at 17:50, Markus Heidelberg
> <[EMAIL PROTECTED]> wrote:
>
> > But I don't plan on adding modified-by for each patch branch. I don't
> > want people using the git repository be plagued by avoidable merge
> > conflicts which keeps them off using it.
>
> Agreed. I will ask the git people if a conflict-free version is possible.
> If yes, this would probably be a good idea to do. If not, the pointer to
> vim_extended should suffice.
OK, thanks for asking, so it is possible ("union" merge driver, see
gitattributes manpage).
3 weeks ago I began reading the git doc, but due to lack of time I hadn't yet
reached the gitattributes.
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"
We could probably do this with a custom merge driver, but this custom driver
would need manual installation of the tool (wait, or even automatically
included in the repo) and probably also manual adaption of the .git/config
file.
I'd really like this to happen all automatically if it's possible, but I'm not
sure about the configuration of the git repo for defining a custom merge
driver. Of course I could write a "git config" command into the readme
section.
Yes, it would be nice somehow to have a modified-by with a text for each
patch, but I don't think it's that important.
Markus
--~--~---------~--~----~------------~-------~--~----~
You received this message from the "vim_use" maillist.
For more information, visit http://www.vim.org/maillist.php
-~----------~----~----~----~------~----~------~--~---
