Hi Markus! -------- Original-Nachricht -------- > Datum: Wed, 2 Dec 2009 02:01:38 +0100 > Von: Markus Heidelberg <[email protected]> > An: [email protected] > Betreff: Re: "error: Entry \'runtime/doc/tags\' not uptodate. Cannot merge." > with vim_mainline git repository
> Dennis Benzinger, 2009-12-01: > > Since a few days I get an "error: Entry 'runtime/doc/tags' not > > uptodate. Cannot merge." message when I do git pull. > > The 'master' branch (including the latest runtime files) currently > doesn't have this problem, but the 'vim' branch. Did you use the latter? I'm a git newbie so I don't really know. I started by doing "git clone git://repo.or.cz/vim_mainline.git" and then updated from time to time by "git pull". Git status shows the following: den...@devbenzingerlinux:~/git_repos/vim_mainline$ git status # On branch master # Your branch is behind 'origin/master' by 2 commits, and can be fast-forwarded. # # Changed but not updated: # (use "git add <file>..." to update what will be committed) # # modified: runtime/doc/tags # # Untracked files: # (use "git add <file>..." to include in what will be committed) # # install.log # make.log # myvim.version # vim.version no changes added to commit (use "git add" and/or "git commit -a") So I suppose I'm using the "master" branch. > > Because I use this working tree just to compile Vim I didn't change > > this file on purpose. > > It gets modified during "make install". Why is the tags file in the working tree updated and not just in the target directory of the installation? > > And what could have caused this error? > > This problem is caused by patches like the oldfiles or startuptime > patches, which modify documentation files in the runtime directory and > add helptags in these files, but don't modify runtime/doc/tags. This > file is only up-to-date in the lastest runtime files from the ftp > server. Nasty. > [...] Isn't the "master" branch meant to include the latest runtime files? Thanks for your explanations and the git repositories! Regards, Dennis Benzinger -- You received this message from the "vim_use" maillist. For more information, visit http://www.vim.org/maillist.php
