Loading ...
Sorry, an error occurred while loading the content.

Re: git question: fatal 'tags' not uptodate

Expand Messages
  • Markus Heidelberg
    ... OK, the merge of feat/rel-line-numbers went fine, the merge of vim-with-runtime was refused because of conflicting local changes (tags). ... Yes, it s done
    Message 1 of 6 , Jun 5 2:11 AM
    • 0 Attachment
      _sc_, 04.06.2009:
      > 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

      OK, the merge of feat/rel-line-numbers went fine, the merge of
      vim-with-runtime was refused because of conflicting local changes
      (tags).

      > > "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

      Yes, it's done in the build dir in target "vimtags" in
      runtime/doc/Makefile called in src/Makefile. Generated files shouldn't
      normally be included in the source tree, but that's unfortunately the
      case here.

      > 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*

      Ah, I understand. This was exactly the change of the last runtime
      updates in this file. Patch 7.2.191 that was puplished one week ago,
      before the runtime, added a new error E812 and changed if_mzsch.txt to
      include this new tag, so the tags file was outdated and you changed it
      during "make install".
      I didn't notice this myself, because I always do
      git checkout -- runtime/doc/tags
      in my update/build script.

      Markus


      --~--~---------~--~----~------------~-------~--~----~
      You received this message from the "vim_dev" maillist.
      For more information, visit http://www.vim.org/maillist.php
      -~----------~----~----~----~------~----~------~--~---
    • _sc_
      On Friday 05 June 2009 4:11 am, Markus Heidelberg wrote: [snip] ... [snip] ... i have added it to mine, right before the merge of vim-with-runtime
      Message 2 of 6 , Jun 5 7:00 AM
      • 0 Attachment
        On Friday 05 June 2009 4:11 am, Markus Heidelberg wrote:

        [snip]

        > OK, the merge of feat/rel-line-numbers went fine, the merge of
        > vim-with-runtime was refused because of conflicting local changes
        > (tags).

        [snip]

        > Ah, I understand. This was exactly the change of the last runtime
        > updates in this file. Patch 7.2.191 that was puplished one week ago,
        > before the runtime, added a new error E812 and changed if_mzsch.txt to
        > include this new tag, so the tags file was outdated and you changed it
        > during "make install".
        > I didn't notice this myself, because I always do
        > git checkout -- runtime/doc/tags
        > in my update/build script.

        i have added it to mine, right before the merge of vim-with-runtime

        http://home.swbell.net/toothpik/.build/vim/u

        does it look more bulletproof now? (don't let your browser cache
        show you the old version)

        sc



        --~--~---------~--~----~------------~-------~--~----~
        You received this message from the "vim_dev" maillist.
        For more information, visit http://www.vim.org/maillist.php
        -~----------~----~----~----~------~----~------~--~---
      • Markus Heidelberg
        ... Yes, it does. But in theoretical an update of runtime/doc/tags is not limited to the vim-runtime branch. I call it after make install in my script,
        Message 3 of 6 , Jun 5 10:40 AM
        • 0 Attachment
          _sc_, 05.06.2009:
          >
          > On Friday 05 June 2009 4:11 am, Markus Heidelberg wrote:
          >
          > > I didn't notice this myself, because I always do
          > > git checkout -- runtime/doc/tags
          > > in my update/build script.
          >
          > i have added it to mine, right before the merge of vim-with-runtime
          >
          > http://home.swbell.net/toothpik/.build/vim/u
          >
          > does it look more bulletproof now?

          Yes, it does. But in theoretical an update of runtime/doc/tags is not
          limited to the vim-runtime branch. I call it after "make install" in my
          script, because I want to have a clean worktree, but it really doesn't
          make a big difference. To be really proof I should additionally add it
          before the merges, though.

          > (don't let your browser cache
          > show you the old version)

          Hey, I'm not stupid ;)


          --~--~---------~--~----~------------~-------~--~----~
          You received this message from the "vim_dev" maillist.
          For more information, visit http://www.vim.org/maillist.php
          -~----------~----~----~----~------~----~------~--~---
        Your message has been successfully submitted and would be delivered to recipients shortly.