On Thu, Sep 10, 2015 at 03:39:57AM +0200, Tony Mechelynck wrote: > Under Mercurial, I simply tell Mercurial not to track runtime/doc/tags > (add runtime/doc/tags to .hgignore and run "hg forget > runtime/doc/tags" followed by "hg commit -m 'do not track the tags > file'"); then when there is a change to it on the remote server > Mercurial (hg fetch --switch-parent) asks me if I want to get the > changes or leave it deleted and I just answer "d". Later, "make > install" recreates $VIMRUNTIME/doc/tags by running :helptags with the > newly-built Vim.
> So yes, on Linux at least, "make install" rebuilds the tags file. I > think it happens also on Windows but it's been a long time since I > left that platform, I could be wrong. I've never been on Mac. > I'm not familiar with git, but there ought to be a way to do the > equivalent in git (mention the file in gitignore and make sure it > isn't tracked). Maybe "git help" could, well, help you. > N.B. False friends: "hg fetch" means "git pull" and vice-versa. > Best regards, > Tony > On Thu, Sep 10, 2015 at 3:04 AM, toothpik <toothp...@gmail.com> wrote: > > I used to sometimes have a problem with the tags module when we were > > under hg, and I had a specific set of things I did to get around it > > > > it seems the problem has followed us to git -- here's my pull: > > > > Wed 19:30 ~/.build/vim/vim: git pull > > remote: Counting objects: 39, done. > > remote: Compressing objects: 100% (38/38), done. > > remote: Total 39 (delta 10), reused 0 (delta 0), pack-reused 0 > > Unpacking objects: 100% (39/39), done. > > From https://github.com/vim/vim > > 3cbe0c0..ed84b76 master -> origin/master > > * [new tag] v7.4.865 -> v7.4.865 > > From https://github.com/vim/vim > > * [new tag] v7.4.862 -> v7.4.862 > > * [new tag] v7.4.863 -> v7.4.863 > > * [new tag] v7.4.864 -> v7.4.864 > > error: Your local changes to the following files would be overwritten by > > merge: > > runtime/doc/tags > > Please, commit your changes or stash them before you can merge. > > Aborting > > > > aren't tags re-created every time we install anyway? > > > > and how do I move forward? commit or stash? and what exactly is a > > stash? for future newbies: thinking if things go sideways I can always blow everything away and restart from scratch I tried commiting the tags file with git commit runtime/doc/tags -m 'why do I have to do this?' then re-ran the pull, re-ran myconfig, then it built as it should -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
