On 18/05/13 14:52, Xavier de Gaye wrote:
On Sat, May 18, 2013 at 2:07 PM, Bram Moolenaar wrote:
Xavier de Gaye wrote:
runtime/doc/tags is under Mercurial control:
$ hg locate runtime/doc/tags
runtime/doc/tags
This file is automatically generated during vim build.
It is annoying to have it appear sometimes in the output of 'hg status'
or when creating a patch with 'hg diff'. You must revert it first
then. I believe it should be removed from the repository.
This file is part of the help system, it needs to be distributed for
non-developers. Otherwise updating the runtime files would require
running "make install".
Simplest if you add it to your .hgignore file. That's easy to merge if
it has any changes.
Thanks for the explanation.
.hgignore is only for non tracked files, so it cannot be used here.
But it's ok, one just need to revert runtime/doc/tags after an
install, and installs do not occur that often.
Adding runtime/doc/tags to .hgignore (plus hg rm runtime/doc/tags and hg
commit) will make the tags file untracked on your clone. Every time it
is modified on Bram's repository you'll get a message on the next update
or fetch:
remote changed runtime/doc/tags which local deleted
use (c)hanged version or leave (d)eleted?
to which you'll answer d to keep it untracked. If you are logging the
output of Mercurial (using, for instance, 2>&1 | tee -a vim.log) you
should set $PYTHONUNBUFFERED to something other than the empty string (I
use "export PYTHONUNBUFFERED='unbuffered'") or you won't see the prompt
until after you've typed the answer.
That's what I do, and it works.
Best regards,
Tony.
--
ARTHUR: The swallow may fly south with the sun, or the house martin or the
plover seek warmer hot lands in winter, yet these are not
strangers to
our land.
SOLDIER: Are you suggesting coconuts migrate?
"Monty Python and the Holy Grail" PYTHON (MONTY)
PICTURES LTD
--
--
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/groups/opt_out.