Hi, nice to see you're still happy with git :) _sc_, 04.06.2009: > > markus (or anybody)-- > > for a week now (exactly a week: it started may 28) i've been > getting an 'M runtime/doc/tags' warning with my updates > > didn't seem too earth-shattering, but today there were updates, > bringing me up to 7.2.196 -- my build succeeded, but ended with a > scary message:
Yes, the last runtime update from yesterday had a change in the tags file. > fatal: Entry 'runtime/doc/tags' not uptodate. Cannot merge. > Merge with strategy recursive failed. > > which, before the Filelist, was preceded with: > > runtime/doc/tags: needs update Since you didn't exactly describe what you did, I can only guess: did you merge, then build, then merge again? Or what is your 'build succeeded' above about? Is this your script? > if i messed it up by running helptags in the runtime on my .build > path, or was hacking with ctags, i don't remember doing it "make install" calls helptags and may modify the file. Which feature branches or other stuff have you included in your branch and what says "git diff" about the tags file? To continue, revert the changes: git checkout -- runtime/doc/tags Markus --~--~---------~--~----~------------~-------~--~----~ You received this message from the "vim_dev" maillist. For more information, visit http://www.vim.org/maillist.php -~----------~----~----~----~------~----~------~--~---
