On Thursday 04 June 2009 1:06 pm, Markus Heidelberg wrote:
>
> Hi, nice to see you're still happy with git :)
git's nice alright, but what makes me happy is your continuing to
maintain the repository AND keep showing up here to patiently
answer my endless newbie questions
oh and while i'm bowing and scraping, i'm really happy with the
relative numbers, i use them a lot, thank you
> _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:
oops -- that was wrong -- the update ended with the message, not
the build
> 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?
i update with my update script:
http://home.swbell.net/toothpik/.build/vim/u
it started out with with the same "M..." message i've been getting
for a week, showed me it was pulling stuff down, then ended with
the scary "fatal" message -- i will temporarily put the update
output here:
http://home.swbell.net/toothpik/update.out
forgive me please for misspeaking earlier: it wasn't the build
that ended with the scary message, it was the update
after today's update i decided to try a build in spite of the scary
message, thinking there couldn't be much of less importance than a
tags file -- i built with my "make reconfig" script because i changed
my environment from 'huge' to 'big' (i have never used profiling,
i'll go back to huge when and if i have a use for it):
http://home.swbell.net/toothpik/.build/vim/mr
i say the build succeeded because it created an executable that
worked and reported the new version number for :ver
> > 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?
i had thought the install called helptags in the production runtime
after installing, not on the .build/vim runtime -- i probably need
to look at that again
git diff shows:
diff --git a/runtime/doc/tags b/runtime/doc/tags
index bb51dff..30f0f25 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -4115,6 +4115,7 @@ E809 cmdline.txt /*E809*
E81 map.txt /*E81*
E810 diff.txt /*E810*
E811 autocmd.txt /*E811*
+E812 if_mzsch.txt /*E812*
E82 message.txt /*E82*
E83 message.txt /*E83*
E84 windows.txt /*E84*
> To continue, revert the changes: git checkout -- runtime/doc/tags
life is good -- the checkout made the 'M...' go away, and this
update brought New Stuff for my runtime (look mom! no rsync!!!)
thanx again markus,
sc
--~--~---------~--~----~------------~-------~--~----~
You received this message from the "vim_dev" maillist.
For more information, visit http://www.vim.org/maillist.php
-~----------~----~----~----~------~----~------~--~---
